Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-02 10:16:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
pancake 2019-02-18 14:51:12 +01:00
parent 2dc2de305b
commit c022270b6d
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libr/core/cmd_type.c
View File

@ -346,6 +346,9 @@ static void save_type_size(Sdb *sdb_types, char *name) {
return;
}
char *type_name_size = r_str_newf ("%s.%s.%s", type, name, "size");
if (!type_name_size) {
return;
}
int size = r_type_get_bitsize (sdb_types, name);
sdb_set (sdb_types, type_name_size, sdb_fmt ("%d", size), 0);
free (type);
@ -357,7 +360,7 @@ static void save_type_size(Sdb *sdb_types, char *name) {
* \param core pointer to radare2 core
* \param parsed the parsed c string in sdb format
*/
R_API void save_parsed_type_size(RCore *core, const char *parsed) {
static void save_parsed_type_size(RCore *core, const char *parsed) {
r_return_if_fail (core && core->anal && parsed);
char *str = strdup (parsed);
if (str) {
@ -366,10 +369,14 @@ R_API void save_parsed_type_size(RCore *core, const char *parsed) {
while ((ptr = strstr (str + offset, "=struct\n")) || (ptr = strstr (str + offset, "=union\n"))) {
*ptr = 0;
char *name = ptr;
if (str + offset == ptr) {
break;
}
while (name - 1 >= str && *(name - 1) != '\n') {
name--;
}
save_type_size (core->anal->sdb_types, name);
*ptr = '=';
offset = ptr + 1 - str;
}
free (str);
@ -442,6 +449,9 @@ static int print_struct_union_list_json(Sdb *TDB, SdbForeachCallback filter) {
pj_o (pj); // {
char *sizecmd = r_str_newf ("%s.%s.size", sdbkv_value (kv), k);
if (!sizecmd) {
break;
}
char *size_s = sdb_querys (TDB, NULL, -1, sizecmd);
pj_ks (pj, "type", k); // key value pair of string and string
pj_ki (pj, "size", size_s ? atoi (size_s) : 0); // key value pair of string and int
@ -974,7 +984,6 @@ static int cmd_type(void *data, const char *input) {
case 0:
print_keys (TDB, core, stdifstruct, printkey_cb, false);
break;
case 'c':{
char *name = NULL;
SdbKv *kv;

1
libr/include/r_core.h
View File

@ -498,7 +498,6 @@ R_API void r_core_print_func_args(RCore *core);
R_API char *resolve_fcn_name(RAnal *anal, const char * func_name);
R_API int r_core_get_stacksz (RCore *core, ut64 from, ut64 to);
R_API void save_parsed_type_size(RCore *core, const char *parsed);
/* anal.c */
R_API RAnalOp* r_core_anal_op(RCore *core, ut64 addr, int mask);

13
libr/util/ctype.c
View File

@ -140,11 +140,13 @@ R_API int r_type_get_bitsize(Sdb *TDB, const char *type) {
return 0;
}
if (!strcmp (t, "type")){
query = sdb_fmt ("type.%s.size", tmptype);
return sdb_num_get (TDB, query, 0); // returns size in bits
query = r_str_newf ("type.%s.size", tmptype);
int r = (int)sdb_num_get (TDB, query, 0); // returns size in bits
free (query);
return r;
}
if (!strcmp (t, "struct") || !strcmp (t, "union")) {
query = sdb_fmt ("%s.%s", t, tmptype);
query = r_str_newf ("%s.%s", t, tmptype);
char *members = sdb_get (TDB, query, 0);
char *next, *ptr = members;
int ret = 0;
@ -154,8 +156,10 @@ R_API int r_type_get_bitsize(Sdb *TDB, const char *type) {
if (!name) {
break;
}
query = sdb_fmt ("%s.%s.%s", t, tmptype, name);
free (query);
query = r_str_newf ("%s.%s.%s", t, tmptype, name);
char *subtype = sdb_get (TDB, query, 0);
R_FREE (query);
if (!subtype) {
break;
}
@ -182,6 +186,7 @@ R_API int r_type_get_bitsize(Sdb *TDB, const char *type) {
} while (next);
free (members);
}
free (query);
return ret;
}
return 0;