Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-20 22:34:39 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix CID 1134930

Browse Source
This commit is contained in:
Anton Kochkov 2014-05-03 16:19:23 +04:00
parent 9c42749652
commit 697e0ac485
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libr/anal/fcn.c
View File

@ -67,7 +67,7 @@ R_API void r_anal_fcn_free(void *_fcn) {
r_list_free (fcn->vars);
r_list_free (fcn->locs);
#if 0
// XXX: some shared basic blocks make it crash.
// XXX: some shared basic blocks make it crash.
// TODO: fix it with sdb
r_list_free (fcn->bbs);
//r_list_free (fcn->locals);
@ -159,7 +159,7 @@ static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut6
RAnalBlock *bbg = NULL;
if (depth<1)
return R_ANAL_RET_ERROR; // MUST BE TOO DEEP
if (bbget (fcn, addr))
if (bbget (fcn, addr))
return R_ANAL_RET_ERROR; // MUST BE DUP
bb = r_anal_bb_new();
bb->addr = addr;
@ -273,14 +273,14 @@ static int fcn_recurse(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut6
}
if (op.jump > addr+512) {
FITFCNSZ();
return R_ANAL_RET_END;
return R_ANAL_RET_END;
}
}
break;
//
//FITFCNSZ();
//return R_ANAL_RET_END;
/// DO not follow jmps.. this is probably a bug ...
/// DO not follow jmps.. this is probably a bug ...
#if 0
anal->iob.read_at (anal->iob.io, op.jump, bbuf, sizeof (bbuf));
FITFCNSZ();
@ -331,14 +331,14 @@ R_API int r_anal_fcn(RAnal *anal, RAnalFunction *fcn, ut64 addr, ut8 *buf, ut64
fcn->size = 0;
fcn->type = (reftype==R_ANAL_REF_TYPE_CODE)?
R_ANAL_FCN_TYPE_LOC: R_ANAL_FCN_TYPE_FCN;
if (fcn->addr == UT64_MAX) fcn->addr = addr;
if (anal->cur && anal->cur->fcn){
int result = anal->cur->fcn(anal, fcn, addr, buf, len, reftype);
if (anal->cur->custom_fn_anal) return result;
}
//if (len>16)
// len -= 16; // XXX: hack to avoid buffer overflow by reading >64 bytes..
return fcn_recurse (anal, fcn, addr, buf, len, FCN_DEPTH);
@ -355,7 +355,7 @@ R_API int r_anal_fcn_insert(RAnal *anal, RAnalFunction *fcn) {
#endif
#if ANAL_FCN_SDB
#if 0
// override bits, size,
// override bits, size,
fcn.<offset>=name,size,type
fcn.<offset>.bbs
fcn.name.<name>=<offset>
@ -458,7 +458,7 @@ R_API RAnalFunction *r_anal_fcn_find(RAnal *anal, ut64 addr, int type) {
}
r_list_foreach (anal->fcns, iter, fcn) {
if (!type || (fcn->type & type)) {
if (addr == fcn->addr || (ret == NULL &&
if (addr == fcn->addr || (ret == NULL &&
((addr > fcn->addr) && (addr < fcn->addr+fcn->size))))
ret = fcn;
}

7
libr/egg/emit_x86.c
View File

@ -145,21 +145,28 @@ static void emit_string(REgg *egg, const char *dstvar, const char *str, int j) {
p = r_egg_mkvar (egg, str2, dstvar, i+BPOFF);
if (attsyntax) r_egg_printf (egg, " movl $0x%x, %s\n", M32(*n), p);
else r_egg_printf (egg, " mov %s, 0x%x\n", p, M32(*n));
free (p);
j -= 4;
}
#undef M32
/* zero */
p = r_egg_mkvar (egg, str2, dstvar, i+BPOFF);
if (attsyntax) r_egg_printf (egg, " movl $0, %s\n", p);
else r_egg_printf (egg, " mov %s, 0\n", p);
free (p);
/* store pointer */
p = r_egg_mkvar (egg, str2, dstvar, j+4+BPOFF);
if (attsyntax) r_egg_printf (egg, " lea %s, %%"R_AX"\n", p);
else r_egg_printf (egg, " lea "R_AX", %s\n", p);
free (p);
p = r_egg_mkvar (egg, str2, dstvar, 0);
if (attsyntax) r_egg_printf (egg, " mov %%"R_AX", %s\n", p);
else r_egg_printf (egg, " mov %s, "R_AX"\n", p);
free (p);
#undef BPOFF
#if 0
char *p, str2[64];