Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-04 19:47:31 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Preventing two little segfaults in zdiff

Browse Source
This commit is contained in:
Rene Laemmert 2019-04-14 17:04:12 +02:00 committed by radare
parent ecdeeb534d
commit e25ddef4a0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/anal/fcn.c
View File

@ -2168,7 +2168,7 @@ R_API int r_anal_fcn_cc(RAnal *anal, RAnalFunction *fcn) {
r_list_foreach (fcn->bbs, iter, bb) {
N++; // nodes
if ((anal && anal->verbose) && bb->jump == UT64_MAX && bb->fail != UT64_MAX) {
if ((!anal || anal->verbose) && bb->jump == UT64_MAX && bb->fail != UT64_MAX) {
eprintf ("Warning: invalid bb jump/fail pair at 0x%08"PFMT64x" (fcn 0x%08"PFMT64x"\n", bb->addr, fcn->addr);
}
if (bb->jump == UT64_MAX && bb->fail == UT64_MAX) {
@ -2188,7 +2188,7 @@ R_API int r_anal_fcn_cc(RAnal *anal, RAnalFunction *fcn) {
}
int result = E - N + (2 * P);
if (result < 1 && anal->verbose) {
if (result < 1 && (!anal || anal->verbose)) {
eprintf ("Warning: CC = E(%d) - N(%d) + (2 * P(%d)) < 1 at 0x%08"PFMT64x"\n", E, N, P, fcn->addr);
}
// r_return_val_if_fail (result > 0, 0);

5
libr/anal/sign.c
View File

@ -1576,10 +1576,9 @@ static int hashMatchCB(RSignItem *it, void *user) {
return 1;
}
char *digest_hex = NULL;
char *digest_hex = r_sign_calc_bbhash (ctx->anal, ctx->fcn);
bool retval = false;
digest_hex = r_sign_calc_bbhash (ctx->anal, ctx->fcn);
if (strcmp (hash->bbhash, digest_hex)) {
if (digest_hex && strcmp (hash->bbhash, digest_hex)) {
goto beach;
}