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

Address comments in #13094 related to maxbbsize and maxfcnsize ##anal (#13102)

Browse Source
This commit is contained in:
radare 2019-02-16 12:11:13 +01:00 committed by GitHub
parent dc06e3c773
commit 5c7eb0bb7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libr/anal/fcn.c
View File

@ -17,7 +17,6 @@
#define JAYRO_04 0
// 16 KB is the maximum size for a basic block
#define MAXBBSIZE (16 * 1024)
#define MAX_FLG_NAME_SIZE 64
#define FIX_JMP_FWD 0
@ -368,10 +367,10 @@ static RAnalBlock *appendBasicBlock(RAnal *anal, RAnalFunction *fcn, ut64 addr)
static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut64 len, int depth);
#define recurseAt(x) {\
ut8 *bbuf = malloc (MAXBBSIZE);\
ut8 *bbuf = malloc (anal->opt.bb_max_size);\
if (bbuf) {\
anal->iob.read_at (anal->iob.io, x, bbuf, MAXBBSIZE);\
ret = fcn_recurse (anal, fcn, x, bbuf, MAXBBSIZE, depth - 1);\
anal->iob.read_at (anal->iob.io, x, bbuf, anal->opt.bb_max_size);\
ret = fcn_recurse (anal, fcn, x, bbuf, anal->opt.bb_max_size, depth - 1);\
r_anal_fcn_update_tinyrange_bbs (fcn);\
free (bbuf);\
}\
@ -996,7 +995,7 @@ repeat:
if (r_cons_is_breaked ()) {
break;
}
if ((len - addrbytes * idx) < 5 && len == MAXBBSIZE) { // TODO: use opt.bb_max_size here
if ((len - addrbytes * idx) < 5 && len == anal->opt.bb_max_size) { // TODO: use opt.bb_max_size here
eprintf (" WARNING : block size exceeding max block size at 0x%08"PFMT64x"\n", addr);
eprintf ("[+] Try changing it with e anal.bb.maxsize\n");
}
@ -1862,7 +1861,6 @@ R_API RAnalFunction *r_anal_fcn_find_name(RAnal *anal, const char *name) {
return NULL;
}
#define MAXBBSIZE (1024*1024*1)
/* rename RAnalFunctionBB.add() */
R_API bool r_anal_fcn_add_bb(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 size, ut64 jump, ut64 fail, int type, RAnalDiff *diff) {
RAnalBlock *bb = NULL, *bbi;
@ -1870,10 +1868,12 @@ R_API bool r_anal_fcn_add_bb(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut64 si
bool mid = false;
st64 n;
if (size == 0) { // empty basic blocks allowed?
r_warn_if_reached ();
eprintf ("warning: empty basic block at 0x%08"PFMT64x" is not allowed. pending discussion.\n", addr);
return false;
}
if (size > MAXBBSIZE) {
if (size > anal->opt.bb_max_size) {
r_warn_if_reached ();
eprintf ("warning: cant allocate such big bb of %"PFMT64d" bytes at 0x%08"PFMT64x"\n", (st64)size, addr);
return false;
}

3
libr/core/canal.c
View File

@ -4775,7 +4775,6 @@ static int __addrs_cmp(void *_a, void *_b) {
return 0;
}
#define MAXFCNSIZE 1024*1024*1
R_API void r_core_anal_inflags(RCore *core, const char *glob) {
RList *addrs = r_list_newf (free);
RListIter *iter;
@ -4808,7 +4807,7 @@ R_API void r_core_anal_inflags(RCore *core, const char *glob) {
continue;
}
st64 sz = a1 - a0;
if (sz < 1 || sz > MAXFCNSIZE) {
if (sz < 1 || sz > core->anal->opt.bb_max_size) {
eprintf ("Warning: invalid flag range from 0x%08"PFMT64x" to 0x%08"PFMT64x"\n", a0, a1);
continue;
}

2
libr/core/cconfig.c
View File

@ -2640,7 +2640,7 @@ R_API int r_core_config_init(RCore *core) {
SETCB ("anal.jmpmid", "true", &cb_anal_jmpmid, "Continue analysis after jump to middle of instruction (x86 only)");
SETCB ("anal.refstr", "false", &cb_anal_searchstringrefs, "Search string references in data references");
SETCB ("anal.bb.maxsize", "1024", &cb_anal_bb_max_size, "Maximum basic block size");
SETCB ("anal.bb.maxsize", "1M", &cb_anal_bb_max_size, "Maximum basic block size");
SETCB ("anal.pushret", "false", &cb_anal_pushret, "Analyze push+ret as jmp");
n = NODECB ("anal.cpp.abi", "itanium", &cb_anal_cpp_abi);

2
shlr/sdb/src/json.c
View File

@ -15,7 +15,7 @@ SDB_API char *sdb_json_get_str (const char *json, const char *path) {
SDB_API bool sdb_json_get_bool(const char *json, const char *path) {
Rangstr rs = json_get (json, path);
const char *p = rs->p + rs->f;
const char *p = rs.p + rs.f;
return (rangstr_length (&rs) == 4 && !strncmp (p, "true", 4));
}