Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 05:09:43 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Check esil_cfg and esil_dfg APIs nullability for #23490

Browse Source
This commit is contained in:
astralia 2024-11-14 01:22:33 +01:00 committed by pancake
parent cb4bce0d0f
commit d7d78c9a6e
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libr/anal/esil_cfg.c
View File

@ -1,10 +1,10 @@
/* radare2 - LGPL - Copyright 2019 - condret */
/* radare2 - LGPL - Copyright 2019 - 2024 - condret */
#include <r_types.h>
#include <r_util.h>
#include <r_anal.h>
/* shared internal state of the subgraph generating functions */
/* shared internal state of the subgraph generating functions */
typedef struct esil_cfg_generator_t {
REsil *esil;
@ -52,7 +52,7 @@ typedef struct esil_value_t {
EsilValType type;
} EsilVal;
/* HELPERS */
/* HELPERS */
// r_str_tok () ?
static char *condrets_strtok(char *str, const char tok) {
@ -157,7 +157,7 @@ void _handle_if_enter (EsilCfgGen *gen, ut32 id, const bool has_next) {
EsilCfgScopeCookie *cookie = R_NEW0 (EsilCfgScopeCookie);
// get current bb
// REsilBB *bb = (REsilBB *)gen->cur->data;
// REsilBB *bb = (REsilBB *)gen->cur->data;
// create if-enter-bb
REsilBB *entered_bb = R_NEW0 (REsilBB);
@ -571,8 +571,9 @@ R_API RAnalEsilCFG *r_anal_esil_cfg_expr(RAnalEsilCFG *cfg, RAnal *anal, const u
return ret;
}
R_API RAnalEsilCFG *r_anal_esil_cfg_op(RAnalEsilCFG *cfg, RAnal *anal, RAnalOp *op) {
if (!op || !anal || !anal->reg || !anal->esil) {
R_API RAnalEsilCFG *r_anal_esil_cfg_op(R_NULLABLE RAnalEsilCFG *cfg, RAnal *anal, RAnalOp *op) {
R_RETURN_VAL_IF_FAIL (anal && op, NULL);
if (!anal->reg || !anal->esil) {
return NULL;
}
REsilBB *glue_bb = R_NEW0 (REsilBB);

20
libr/anal/esil_dfg.c
View File

@ -1,4 +1,4 @@
/* radare - LGPL - Copyright 2019-2023 - condret */
/* radare - LGPL - Copyright 2019-2024 - condret */
#include <r_anal.h>
@ -30,7 +30,8 @@ typedef struct r_anal_esil_dfg_const_reducer_t {
// TODO: simple const propagation - use node->type of srcs to propagate consts of pushed vars
R_API RAnalEsilDFGNode *r_anal_esil_dfg_node_new(RAnalEsilDFG *edf, const char *c) {
R_API RAnalEsilDFGNode *r_anal_esil_dfg_node_new(RAnalEsilDFG *edf, R_NULLABLE const char *c) {
R_RETURN_VAL_IF_FAIL (edf, NULL);
RAnalEsilDFGNode *ret = R_NEW0 (RAnalEsilDFGNode);
ret->content = r_strbuf_new (c);
ret->idx = edf->idx++;
@ -1640,10 +1641,9 @@ R_API void r_anal_esil_dfg_free(RAnalEsilDFG *dfg) {
}
}
R_API RAnalEsilDFG *r_anal_esil_dfg_expr(RAnal *anal, RAnalEsilDFG *dfg, const char *expr, bool use_map_info, bool use_maps) {
if (!expr) {
return NULL;
}
R_API RAnalEsilDFG *r_anal_esil_dfg_expr(RAnal *anal, R_NULLABLE RAnalEsilDFG *dfg, const char *expr,
bool use_map_info, bool use_maps) {
R_RETURN_VAL_IF_FAIL (anal && expr, NULL);
REsil *esil = r_esil_new (4096, 0, 1);
if (!esil) {
return NULL;
@ -2073,18 +2073,14 @@ R_API void r_anal_esil_dfg_fold_const(RAnal *anal, RAnalEsilDFG *dfg) {
}
R_API RStrBuf *r_anal_esil_dfg_filter(RAnalEsilDFG *dfg, const char *reg) {
if (!dfg || !reg) {
return NULL;
}
R_RETURN_VAL_IF_FAIL (dfg && reg, NULL);
RGraphNode *resolve_me = _edf_reg_get (dfg, reg);
return resolve_me? filter_gnode_expr (dfg, resolve_me): NULL;
}
R_API RStrBuf *r_anal_esil_dfg_filter_expr(RAnal *anal, const char *expr, const char *reg,
bool use_map_info, bool use_maps) {
if (!reg) {
return NULL;
}
R_RETURN_VAL_IF_FAIL (anal && expr && reg, NULL);
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (anal, NULL, expr, use_map_info, use_maps);
if (!dfg) {
return NULL;