Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-13 01:00:37 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix a possible null deref in fi->name for #7872

Browse Source
This commit is contained in:
pancake 2017-07-07 16:46:20 +02:00
parent 5a0551f2b7
commit 9c57ebc06a
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libr/core/disasm.c
View File

@ -1039,10 +1039,9 @@ static void ds_atabs_option(RDisasmState *ds) {
}
static int handleMidFlags(RCore *core, RDisasmState *ds, bool print) {
RFlagItem *fi;
int i;
ds->hasMidflag = false;
ds->hasMidflag = false;
if (ds->midcursor && core->print->cur != -1) {
ut64 cur = core->offset + core->print->cur;
ut64 from = ds->at;
@ -1052,9 +1051,9 @@ static int handleMidFlags(RCore *core, RDisasmState *ds, bool print) {
}
}
for (i = 1; i < ds->oplen; i++) {
fi = r_flag_get_i (core->flags, ds->at + i);
if (fi) {
if (ds->midflags == 2 && ((fi->name && fi->name[0] == '$') || (fi->realname && fi->realname[0] == '$'))) {
RFlagItem *fi = r_flag_get_i (core->flags, ds->at + i);
if (fi && fi->name) {
if (ds->midflags == 2 && ((fi->name[0] == '$') || (fi->realname && fi->realname[0] == '$'))) {
i = 0;
} else if (!strncmp (fi->name, "hit.", 4)) { // use search.prefix ?
i = 0;