$: Use rz_flag_get to check if flag exists (#4377)

rizinorg · Mar 22, 2024 · c52750c · c52750c
1 parent ab593b3
commit c52750c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/librz/core/cmd/cmd_alias.c b/librz/core/cmd/cmd_alias.c
@@ -117,9 +117,9 @@ RZ_IPI RzCmdStatus rz_alias_handler(RzCore *core, int argc, const char **argv) {
 				rz_core_cmd0(core, v);
 			}
 		} else {
-			ut64 at = rz_num_get(core->num, buf + 1);
-			if (at != UT64_MAX) {
-				rz_core_seek(core, at, true);
+			RzFlagItem *flag = rz_flag_get(core->flags, buf + 1);
+			if (flag) {
+				rz_core_seek(core, flag->offset, true);
 			} else {
 				RZ_LOG_ERROR("core: unknown alias '%s'\n", buf + 1);
 				free(buf);

diff --git a/test/db/archos/darwin-x64/cmd_i b/test/db/archos/darwin-x64/cmd_i
@@ -4,7 +4,8 @@ FILE==
 CMDS=<<EOF
 cd `e dir.tmp`
 e io.cache=true
-(show_fname fname; wz ${fname}; prz `$b` > `prz`; o `prz`; i~file; ij; rm `prz`)
+(show_fname fname; wz ${fname}; prz `$size` > `prz`; o `prz`; i~file; ij; rm `prz`)
+$size=%l \`prz\`
 .(show_fname A\x1b¢\302\200€𝄞\363\240\201\201\\.bin)
 .(show_fname B\x1b¢\302\200€𝄞\363\240\201\201\\.bin)
 # INVALID FILENAME .(show_fname B\x1b¢\302\200\201€𝄞\363\240\201\201\\.bin)

diff --git a/test/db/archos/linux-any/cmd_i b/test/db/archos/linux-any/cmd_i
@@ -5,6 +5,7 @@ CMDS=<<EOF
 cd `e dir.tmp`
 e io.cache=true
 (show_fname fname; wz ${fname}; prz `$size` > `prz` ; o `prz`; i~file; ij; rm `prz`)
+$size=%l \`prz\`
 .(show_fname A\x1b¢\302\200€𝄞\363\240\201\201\\.bin)
 .(show_fname B\x1b¢\302\200€𝄞\363\240\201\201\\.bin)
 .(show_fname B\x1b¢\302\200\201€𝄞\363\240\201\201\\.bin)

diff --git a/test/db/cmd/cmd_alias b/test/db/cmd/cmd_alias
@@ -85,3 +85,11 @@ $dis=base64:cGRm
 $dis=pdf
 EOF
 RUN
+
+NAME=Alias not found
+FILE=--
+CMDS=$dis
+EXPECT_ERR=<<EOF
+ERROR: core: unknown alias 'dis'
+EOF
+RUN