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

Fix int->bool issue after de-boolt-ification

Browse Source
This commit is contained in:
pancake 2016-01-03 02:38:14 +01:00
parent 9e129a793c
commit 23c81e7642
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libr/core/cmd_search.c
View File

@ -752,7 +752,7 @@ ret:
return hitlist;
}
static void print_rop (RCore *core, RList *hitlist, char mode, int *json_first) {
static void print_rop (RCore *core, RList *hitlist, char mode, bool *json_first) {
const char *otype;
RCoreAsmHit *hit = NULL;
RListIter *iter;
@ -766,9 +766,8 @@ static void print_rop (RCore *core, RList *hitlist, char mode, int *json_first)
switch (mode) {
case 'j':
//Handle comma between gadgets
if (*json_first == 0)
r_cons_strcat (",");
else *json_first = 0;
if (!*json_first) r_cons_strcat (",");
else *json_first = false;
r_cons_printf ("{\"opcodes\":[");
r_list_foreach (hitlist, iter, hit) {
@ -1110,7 +1109,6 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
continue;
}
if (json) mode = 'j';
if ((mode == 'l') && subchain) {
do {
print_rop (core, hitlist, mode, &json_first);
@ -1120,7 +1118,6 @@ static int r_core_search_rop(RCore *core, ut64 from, ut64 to, int opt, const cha
print_rop (core, hitlist, mode, &json_first);
}
}
if (increment != 1)
i = next;
}