dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in pfj

This commit is contained in:
pancake 2014-12-01 23:30:32 +01:00
parent 21288ac6ab
commit 12f598d77d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libr/util/p_format.c
View File

@ -162,6 +162,7 @@ static int r_print_format_string(const RPrint* p, ut64 seeki, ut64 addr64, ut64
ut8 buffer[255];
if (!json)
p->printf ("0x%08"PFMT64x" = ", seeki);
buffer[0] = 0;
if (p->iob.read_at) {
if (is64 == 1)
p->iob.read_at (p->iob.io, addr64, buffer, sizeof (buffer)-8);
@ -171,9 +172,9 @@ static int r_print_format_string(const RPrint* p, ut64 seeki, ut64 addr64, ut64
printf ("(cannot read memory)\n");
return -1;
}
if (json)
p->printf ("%d,\"string\":\"%s\"}", seeki, addr);
else {
if (json) {
p->printf ("%d,\"string\":\"%s\"}", seeki, buffer);
} else {
p->printf ("0x%08"PFMT64x" -> 0x%08"PFMT64x" ", seeki, addr);
p->printf ("%s", buffer);
}