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

pf: missing structname fix and bumped the nesting limit to 5 (#8759)

Browse Source 
* pf: bumped the nesting limit to 5
* pf: don't mutilate '?' it is already handled
This commit is contained in:
Alex Kornitzer 2017-11-17 12:07:18 +00:00 committed by Anton Kochkov
parent 04c492a60c
commit 34511da1f0
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libr/util/p_format.c
View File

@ -6,7 +6,7 @@
#include "r_reg.h"
#ifdef _MSC_VER
#include <time.h>
#endif
#endif
#define NOPTR 0
#define PTRSEEK 1
#define PTRBACK 2
@ -1164,7 +1164,7 @@ static void r_print_format_num (const RPrint *p, int endian, int mode, const cha
updateAddr (buf + i, size - i, endian, &addr, NULL);
}
if (elem == -1 || elem == 0) {
r_print_format_num_specifier (p, addr, bytes, sign);
r_print_format_num_specifier (p, addr, bytes, sign);
if (elem == 0) {
elem = -2;
}
@ -1193,7 +1193,7 @@ static void r_print_format_num (const RPrint *p, int endian, int mode, const cha
updateAddr (buf + i, size, endian, &addr, NULL);
}
if (elem == -1 || elem == 0) {
r_print_format_num_specifier (p, addr, bytes, sign);
r_print_format_num_specifier (p, addr, bytes, sign);
if (elem == 0) {
elem = -2;
}
@ -1219,7 +1219,7 @@ int r_print_format_struct_size(const char *f, RPrint *p, int mode, int n) {
if (!f) {
return -1;
}
if (n >= 3) {
if (n >= 5) { // This is the nesting level, is this not a bit arbitrary?!
return 0;
}
char *o = strdup (f);
@ -1653,7 +1653,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
// Max byte number where updateAddr will look into
if (len - i < 7) {
updateAddr (buf + i, THRESHOLD - (len - i), endian, &addr, &addr64);
} else {
} else {
updateAddr (buf + i, len - i, endian, &addr, &addr64);
}
} else {
@ -1797,7 +1797,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
continue;
case 'p': // pointer reference
if (*(arg+1) == '2') {
tmp = 'w';
tmp = 'w';
arg++;
} else if (*(arg+1) == '4') {
tmp = 'x';
@ -2031,11 +2031,11 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
slide += NESTEDSTRUCT;
if (size == -1) {
s = r_print_format_struct (p, seeki,
buf+i, len-i, fmtname, slide,
mode, setval, nxtfield, anon);
buf+i, len-i, fmtname, slide,
mode, setval, nxtfield, anon);
i += (isptr) ? (p->bits / 8) : s;
if (MUSTSEEJSON) {
if (!isptr && (!arg[1] || arg[1] == ' ')) {
if (!isptr && (!arg[1] || arg[1] == ' ')) {
p->cb_printf ("]}");
}
}
@ -2133,6 +2133,20 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len,
p->cb_printf ("\n");
}
last = tmp;
// XXX: Due to the already noted issues with the above, we need to strip
// args from fmt:args the same way we strip fmt BUT only for enums as
// nested structs seem to be handled correctly above!
if (arg[0] == 'E') {
char *end_fmt = strchr (arg, ' ');
char *next_args = strchr (end_fmt+1, ' ');
if (next_args) {
while (*next_args != '\0') {
*end_fmt++ = *next_args++;
}
}
*end_fmt = '\0';
}
}
if (otimes > 1) {
if (MUSTSEEJSON) {