Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 21:29:49 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix assert on null deref with the 'pf E' command ##print

Browse Source
This commit is contained in:
pancake 2023-06-06 18:47:26 +02:00 committed by pancake
parent a4b527d6a2
commit 30081d14d9
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/core/cbin.c
View File

@ -3407,10 +3407,10 @@ static int bin_fields(RCore *r, PJ *pj, int mode, int va) {
}
char *o = r_core_cmd_strf (r, "pfj%c%s@0x%"PFMT64x,
field->format_named ? '.' : ' ', field->format, field->vaddr);
if (o && *o) {
r_str_trim_tail(o);
if (R_STR_ISNOTEMPTY (o)) {
r_str_trim_tail (o);
pj_k (pj, "pf");
pj_j (pj, o);
pj_j (pj, o); // XXX if json is invalid this may fuck the things
}
free (o);
pj_end (pj);

17
libr/util/format.c
View File

@ -1463,7 +1463,7 @@ static void r_print_format_bitfield(const RPrint* p, ut64 seeki, char *fmtname,
static void r_print_format_enum(const RPrint* p, ut64 seeki, char *fmtname,
char *fieldname, ut64 addr, int mode, int size) {
char *enumvalue = NULL;
r_return_if_fail (p && fmtname && fieldname);
if (size >= 8) {
// avoid shift overflow
} else {
@ -1472,8 +1472,8 @@ static void r_print_format_enum(const RPrint* p, ut64 seeki, char *fmtname,
if (MUSTSEE && !SEEVALUE) {
p->cb_printf ("0x%08"PFMT64x" = ", seeki);
}
enumvalue = r_type_enum_member (p->sdb_types, fmtname, NULL, addr);
if (enumvalue && *enumvalue) {
char *enumvalue = r_type_enum_member (p->sdb_types, fmtname, NULL, addr);
if (R_STR_ISNOTEMPTY (enumvalue)) {
if (mode & R_PRINT_DOT) {
p->cb_printf ("%s.%s", fmtname, enumvalue);
} else if (MUSTSEEJSON) {
@ -2662,7 +2662,11 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len, cons
if (size >= ARRAYINDEX_COEF) {
size %= ARRAYINDEX_COEF;
}
r_print_format_enum (p, seeki, fmtname, fieldname, addr, mode, size);
if (fmtname) {
r_print_format_enum (p, seeki, fmtname, fieldname, addr, mode, size);
} else {
R_LOG_ERROR ("Missing enum type after the E()");
}
i += (size == -1)? 1: size;
break;
case 'r':
@ -2720,10 +2724,7 @@ R_API int r_print_format(RPrint *p, ut64 seek, const ut8* b, const int len, cons
format = strchr (fmtname, ' ');
if (format) {
anon = 1;
fmtname = format;
while (*fmtname == ' ') {
fmtname++;
}
fmtname = (char *)r_str_trim_head_ro (format);
}
oldslide = slide;
//slide += (isptr) ? STRUCTPTR : NESTEDSTRUCT;

1
libr/util/utype.c
View File

@ -84,6 +84,7 @@ R_API void r_type_enum_free(RTypeEnum *member) {
}
R_API char *r_type_enum_member(Sdb *TDB, const char *name, const char *member, ut64 val) {
r_return_val_if_fail (TDB && name, NULL);
if (r_type_kind (TDB, name) != R_TYPE_ENUM) {
return NULL;
}