portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

types: fix nested structure typedefs format (#4614)

Browse source
This commit is contained in:
Anton Kochkov 2024-09-05 22:36:57 +08:00 committed by GitHub
parent 1f78e11581
commit 5830679d3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
librz/type/format.c
View file

@ -2850,7 +2850,11 @@ static void base_type_to_format_no_unfold(const RzTypeDB *typedb, RZ_NONNULL RzB
char *fmt = rz_type_as_format(typedb, type->type);
if (fmt) {
rz_strbuf_append(format, fmt);
rz_strbuf_appendf(fields, "%s ", identifier);
if (!rz_type_is_atomic(typedb, type->type)) {
rz_strbuf_appendf(fields, "(%s)%s ", type->name, identifier);
} else {
rz_strbuf_appendf(fields, "%s ", identifier);
}
} else {
type_to_format_pair(typedb, format, fields, identifier, type->type);
}

22
test/db/cmd/types
View file

@ -8303,3 +8303,25 @@ EXPECT=<<EOF
4 fd: 6 +0x00000d98 0x00200d98 - 0x0020100f r-- vmap.LOAD1
EOF
RUN
NAME=tp nested structs with typedefs
FILE=--
CMDS=<<EOF
e asm.arch=arm
e asm.bits=64
td "typedef struct { int a; char b; struct { float c; char d[5]; } q; long long *z; } bla_t"
td "typedef struct { char a; unsigned b; long long *z; } moo_t"
td "typedef struct { void *a; char b[10]; struct { double c; char d[5]; } q;} goo_t"
td "typedef struct { bla_t bla[2]; moo_t moot; goo_t goot; } bmg"
tl bmg;
tl bla_t;
tl moo_t;
tl goo_t;
EOF
EXPECT=<<EOF
typedef bmg (0x2a0) "[2]??? (bla_t)bla (moo_t)moot (goo_t)goot"
typedef bla_t (0xb0) "dc?*q a b (anonymous struct 1)q z"
typedef moo_t (0x48) "c*q a z"
typedef goo_t (0xf8) "p[10]c? a b (anonymous struct 4)q"
EOF
RUN