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

Fix infinite loop if first case of switch table points to same block

Browse source
This commit is contained in:
GustavoLCR 2021-09-23 20:26:29 -03:00 committed by Anton Kochkov
parent d6f21427f3
commit f7c0700a09
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
librz/analysis/block.c
View file

@ -516,20 +516,25 @@ RZ_API bool rz_analysis_block_recurse_depth_first(RzAnalysisBlock *block, RzAnal
} else if (cur_bb->fail != UT64_MAX && !ht_up_find_kv(visited, cur_bb->fail, NULL)) {
cur_bb = rz_analysis_get_block_at(analysis, cur_bb->fail);
} else {
RzAnalysisCaseOp *cop = NULL;
if (cur_bb->switch_op && !cur_ctx->switch_it) {
cur_ctx->switch_it = cur_bb->switch_op->cases->head;
cop = rz_list_first(cur_bb->switch_op->cases);
cur_ctx->switch_it = rz_list_head(cur_bb->switch_op->cases);
} else if (cur_ctx->switch_it) {
while ((cur_ctx->switch_it = rz_list_iter_get_next(cur_ctx->switch_it))) {
cop = rz_list_iter_get_data(cur_ctx->switch_it);
if (!ht_up_find_kv(visited, cop->jump, NULL)) {
cur_ctx->switch_it = rz_list_iter_get_next(cur_ctx->switch_it);
}
if (cur_ctx->switch_it) {
RzAnalysisCaseOp *cop = rz_list_iter_get_data(cur_ctx->switch_it);
while (ht_up_find_kv(visited, cop->jump, NULL)) {
cur_ctx->switch_it = rz_list_iter_get_next(cur_ctx->switch_it);
if (!cur_ctx->switch_it) {
cop = NULL;
break;
}
cop = NULL;
cop = rz_list_iter_get_data(cur_ctx->switch_it);
}
cur_bb = cop ? rz_analysis_get_block_at(analysis, cop->jump) : NULL;
} else {
cur_bb = NULL;
}
cur_bb = cop ? rz_analysis_get_block_at(analysis, cop->jump) : NULL;
}
if (cur_bb) {
RecurseDepthFirstCtx ctx = { cur_bb, NULL };