portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rz-asm: show an error when -m arg is invalid (#6519)

Browse source 
Co-authored-by: Anton Kochkov <anton.kochkov@gmail.com>
This commit is contained in:
NOT XVilka 2026-06-17 11:22:17 +08:00 committed by GitHub
parent 880c8005f7
commit 8fde88fd9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
librz/core/casm.c
View file

@ -284,8 +284,13 @@ RZ_API RzCmdStatus rz_core_cpu_descs_print(RZ_NONNULL RzCore *core, RZ_NONNULL c
rz_list_sort(plugin_list, (RzListComparator)rz_asm_plugin_cmp, NULL);
RzListIter *it;
RzAsmPlugin *ap;
bool found = false;
rz_list_foreach (plugin_list, it, ap) {
if (ap->cpus && ap->get_cpu_desc && RZ_STR_EQ(plugin, ap->name)) {
if (!RZ_STR_EQ(plugin, ap->name)) {
continue;
}
found = true;
if (ap->cpus && ap->get_cpu_desc) {
char **desc = ap->get_cpu_desc();
if (!desc) {
rz_iterator_free(iter);
@ -296,11 +301,15 @@ RZ_API RzCmdStatus rz_core_cpu_descs_print(RZ_NONNULL RzCore *core, RZ_NONNULL c
rz_cons_printf("%-15s %s", desc[i], desc[i + 1]);
rz_cons_newline();
}
break;
}
break;
}
rz_iterator_free(iter);
rz_list_free(plugin_list);
if (!found) {
RZ_LOG_ERROR("Unknown asm plugin '%s'\n", plugin);
return RZ_CMD_STATUS_ERROR;
}
return RZ_CMD_STATUS_OK;
}

3
librz/main/rz-asm.c
View file

@ -637,10 +637,11 @@ RZ_API int rz_main_rz_asm(int argc, const char *argv[]) {
RzCore *core = rz_core_new();
RzAsm *tmp_asm = core->rasm;
core->rasm = as->a;
rz_core_cpu_descs_print(core, opt.arg);
RzCmdStatus status = rz_core_cpu_descs_print(core, opt.arg);
rz_cons_flush();
core->rasm = tmp_asm;
rz_core_free(core);
ret = (status == RZ_CMD_STATUS_OK) ? 0 : 1;
goto beach;
}
case '@':

9
test/db/tools/rz_asm
View file

@ -675,3 +675,12 @@ EXPECT=<<EOF
tricore Generic TriCore CPU family by Infineon
EOF
RUN
NAME=rz-asm -m unknown architecture shows an error
TOOL=rz-asm
ARGS=-m ic
EXIT_STATUS=1
EXPECT_ERR=<<EOF
ERROR: Unknown asm plugin 'ic'
EOF
RUN