Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-03 12:12:06 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix pdJ for strings and retry (#9004)

Browse Source
This commit is contained in:
Florian Märkl 2017-12-11 23:08:18 +01:00 committed by radare
parent ce77004507
commit f765c414e2
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libr/core/disasm.c
View File

@ -2300,9 +2300,25 @@ static int ds_print_meta_infos(RDisasmState *ds, ut8* buf, int len, int idx) {
switch (mi->type) {
case R_META_TYPE_STRING:
{
char *quote = "\"";
out = r_str_escape (mi->str);
r_cons_printf (" .string %s\"%s\"%s ; len=%"PFMT64d,
COLOR (ds, color_btext), out, COLOR_RESET (ds),
if (!out) {
break;
}
if (ds->use_json) {
// escape twice for json
char *out2 = out;
out = r_str_escape (out2);
free (out2);
if (!out) {
break;
}
quote = "\\\"";
}
r_cons_printf (" .string %s%s%s%s%s ; len=%"PFMT64d,
COLOR (ds, color_btext), quote, out, quote, COLOR_RESET (ds),
mi->size);
free (out);
delta = ds->at - mi->from;
@ -4231,10 +4247,6 @@ toro:
inc += ds->asmop.payload + (ds->asmop.payload % ds->core->assembler->dataalign);
}
if (ds->use_json) {
r_cons_print ("]\n");
}
R_FREE (nbuf);
r_cons_break_pop ();
@ -4267,6 +4279,11 @@ toro:
R_FREE (nbuf);
}
#endif
if (ds->use_json) {
r_cons_print ("]\n");
}
r_print_set_rowoff (core->print, ds->lines, ds->at - addr);
r_print_set_rowoff (core->print, ds->lines + 1, UT32_MAX);
// TODO: this too (must review)