Fix format generation out of types (#3974)

rizinorg · Nov 14, 2023 · 221f4da · 221f4da
1 parent 271836a
commit 221f4da
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/librz/type/format.c b/librz/type/format.c
@@ -2977,6 +2977,13 @@ static void type_to_format(const RzTypeDB *typedb, RzStrBuf *buf, RzType *type)
 				rz_strbuf_append(buf, "?");
 			} else if (type->identifier.kind == RZ_TYPE_IDENTIFIER_KIND_ENUM) {
 				rz_strbuf_append(buf, "E");
+			} else {
+				RzBaseType *btyp = rz_type_get_base_type(typedb, type);
+				if (btyp) {
+					RzStrBuf *fields = rz_strbuf_new("");
+					base_type_to_format_no_unfold(typedb, btyp, type->identifier.name, buf, fields);
+					rz_strbuf_free(fields);
+				}
 			}
 		}
 	} else if (type->kind == RZ_TYPE_KIND_ARRAY) {

diff --git a/test/db/cmd/types b/test/db/cmd/types
@@ -495,10 +495,17 @@ CMDS=<<EOF
 td "struct test_struct{int x;int y;};"
 ts test_struct
 tsd test_struct
+td "typedef uint16_t word;"
+td "typedef uint32_t dword;"
+td "struct test_struct2{word a; word b[5]; word c; word d[10]; dword e;};"
+ts test_struct2
+tsd test_struct2
 EOF
 EXPECT=<<EOF
 pf dd x y
 struct test_struct { int x; int y; };
+pf w[5]ww[10]wd a (word)b c (word)d e
+struct test_struct2 { word a; word b[5]; word c; word d[10]; dword e; };
 EOF
 RUN