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

Use offset info in r_type_get_struct_memb() (#17930)

This commit is contained in:
Paul I 2020-11-19 06:52:01 +03:00 committed by GitHub
parent 1295f7748e
commit 890b19a1f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libr/util/utype.c
View File

@ -195,7 +195,7 @@ R_API ut64 r_type_get_bitsize(Sdb *TDB, const char *type) {
}
R_API char *r_type_get_struct_memb(Sdb *TDB, const char *type, int offset) {
int i, prev_typesize, typesize = 0;
int i, cur_offset, next_offset = 0;
char *res = NULL;
if (offset < 0) {
@ -223,17 +223,28 @@ R_API char *r_type_get_struct_memb(Sdb *TDB, const char *type, int offset) {
free (subtype);
break;
}
int val = r_num_math (NULL, r_str_word_get0 (subtype, len - 1));
int arrsz = val ? val : 1;
if ((typesize / 8) == offset) {
cur_offset = r_num_math (NULL, r_str_word_get0 (subtype, len - 2));
if (cur_offset > 0 && cur_offset < next_offset) {
free (subtype);
break;
}
if (!cur_offset) {
cur_offset = next_offset;
}
if (cur_offset == offset) {
res = r_str_newf ("%s.%s", type, name);
free (subtype);
break;
}
prev_typesize = typesize;
typesize += r_type_get_bitsize (TDB, subtype) * arrsz;
int arrsz = r_num_math (NULL, r_str_word_get0 (subtype, len - 1));
int fsize = (r_type_get_bitsize (TDB, subtype) * (arrsz ? arrsz : 1)) / 8;
if (!fsize) {
free (subtype);
break;
}
next_offset = cur_offset + fsize;
// Handle nested structs
if (offset < (typesize / 8)) {
if (offset > cur_offset && offset < next_offset) {
char *nested_type = (char *)r_str_word_get0 (subtype, 0);
if (r_str_startswith (nested_type, "struct ") && !r_str_endswith (nested_type, " *")) {
len = r_str_split (nested_type, ' ');
@ -242,7 +253,7 @@ R_API char *r_type_get_struct_memb(Sdb *TDB, const char *type, int offset) {
break;
}
nested_type = (char *)r_str_word_get0 (nested_type, 1);
char *nested_res = r_type_get_struct_memb (TDB, nested_type, offset - (prev_typesize / 8));
char *nested_res = r_type_get_struct_memb (TDB, nested_type, offset - cur_offset);
if (nested_res) {
len = r_str_split(nested_res, '.');
res = r_str_newf ("%s.%s.%s", type, name, r_str_word_get0 (nested_res, len - 1));

37
test/db/cmd/types
View File

@ -1629,3 +1629,40 @@ fcn.00011b90
fcn.00014d50
EOF
RUN
NAME=aht aligned
FILE=-
CMDS=<<EOF
"td struct foo {char gap;int bar __attribute__((__aligned__(4)));};"
"td struct foo2 {char gap[1];int bar __attribute__((__aligned__(4)));};"
"td struct foo3 {char gap[3];int bar __attribute__((__aligned__(4)));};"
"td struct foo4 {char gap[4];int bar;};"
"td struct foo5 {int gap;int bar;};"
ahts 4 ~foo
?e =
wx c7400400000000
aht foo.bar
pd 1
EOF
EXPECT=<<EOF
foo.bar
foo2.bar
foo3.bar
foo4.bar
foo5.bar
=
0x00000000 c74004000000. mov dword [rax + foo.bar], 0
EOF
RUN
NAME=ahts nested
FILE=-
CMDS=<<EOF
"td struct foo {int bar;int cow;};"
"td struct spam {int ham;struct foo _foo;int eggs;};"
ahts 8 ~spam
EOF
EXPECT=<<EOF
spam._foo.cow
EOF
RUN