Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-25 15:24:36 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Move member initialization of RAnalBaseType to new

Browse Source
This commit is contained in:
Florian Märkl 2020-09-05 21:02:27 +02:00
parent 737eacdc13
commit d1bcbcf041
2 changed files with 32 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libr/anal/type.c
View File

@ -170,23 +170,18 @@ R_IPI void union_type_member_free(void *e, void *user) {
static RAnalBaseType *get_enum_type(RAnal *anal, const char *sname) {
r_return_val_if_fail (anal && sname, NULL);
RAnalBaseType *base_type = R_NEW0 (RAnalBaseType);
RAnalBaseType *base_type = r_anal_new_base_type (R_ANAL_BASE_TYPE_KIND_ENUM);
if (!base_type) {
return NULL;
}
base_type->kind = R_ANAL_BASE_TYPE_KIND_ENUM;
RAnalBaseTypeEnum base_enum;
char *members = get_type_data (anal->sdb_types, "enum", sname);
if (!members) {
goto error;
}
RVector cases;
r_vector_init (&cases, sizeof (RAnalEnumCase), enum_type_case_free, NULL);
if (!r_vector_reserve (&cases, (size_t)sdb_alen (members))) {
RVector *cases = &base_type->enum_data.cases;
if (!r_vector_reserve (cases, (size_t)sdb_alen (members))) {
goto error;
}
@ -205,7 +200,7 @@ static RAnalBaseType *get_enum_type(RAnal *anal, const char *sname) {
RAnalEnumCase cas = { .name = strdup (cur), .val = strtol (value, NULL, 16) };
void *element = r_vector_push (&cases, &cas); // returns null if no space available
void *element = r_vector_push (cases, &cas); // returns null if no space available
if (!element) {
goto error;
}
@ -213,38 +208,30 @@ static RAnalBaseType *get_enum_type(RAnal *anal, const char *sname) {
sdb_aforeach_next (cur);
}
free (members);
base_enum.cases = cases;
base_type->enum_data = base_enum;
return base_type;
error:
free (base_type);
free (members);
r_vector_fini (&cases);
r_anal_free_base_type (base_type);
return NULL;
}
static RAnalBaseType *get_struct_type(RAnal *anal, const char *sname) {
r_return_val_if_fail (anal && sname, NULL);
RAnalBaseType *base_type = R_NEW0 (RAnalBaseType);
RAnalBaseType *base_type = r_anal_new_base_type (R_ANAL_BASE_TYPE_KIND_STRUCT);
if (!base_type) {
return NULL;
}
base_type->kind = R_ANAL_BASE_TYPE_KIND_STRUCT;
RAnalBaseTypeStruct base_struct;
char *sdb_members = get_type_data (anal->sdb_types, "struct", sname);
if (!sdb_members) {
goto error;
}
RVector members;
r_vector_init (&members, sizeof (RAnalStructMember), struct_type_member_free, NULL);
if (!r_vector_reserve (&members, (size_t)sdb_alen (sdb_members))) {
RVector *members = &base_type->struct_data.members;
if (!r_vector_reserve (members, (size_t)sdb_alen (sdb_members))) {
goto error;
}
@ -275,7 +262,7 @@ static RAnalBaseType *get_struct_type(RAnal *anal, const char *sname) {
free (values);
void *element = r_vector_push (&members, &cas); // returns null if no space available
void *element = r_vector_push (members, &cas); // returns null if no space available
if (!element) {
goto error;
}
@ -283,38 +270,30 @@ static RAnalBaseType *get_struct_type(RAnal *anal, const char *sname) {
sdb_aforeach_next (cur);
}
free (sdb_members);
base_struct.members = members;
base_type->struct_data = base_struct;
return base_type;
error:
free (base_type);
r_anal_free_base_type (base_type);
free (sdb_members);
r_vector_fini (&members);
return NULL;
}
static RAnalBaseType *get_union_type(RAnal *anal, const char *sname) {
r_return_val_if_fail (anal && sname, NULL);
RAnalBaseType *base_type = R_NEW0 (RAnalBaseType);
RAnalBaseType *base_type = r_anal_new_base_type (R_ANAL_BASE_TYPE_KIND_UNION);
if (!base_type) {
return NULL;
}
base_type->kind = R_ANAL_BASE_TYPE_KIND_UNION;
RAnalBaseTypeUnion base_union;
char *sdb_members = get_type_data (anal->sdb_types, "union", sname);
if (!sdb_members) {
goto error;
}
RVector members;
r_vector_init (&members, sizeof (RAnalUnionMember), union_type_member_free, NULL);
if (!r_vector_reserve (&members, (size_t)sdb_alen (sdb_members))) {
RVector *members = &base_type->union_data.members;
if (!r_vector_reserve (members, (size_t)sdb_alen (sdb_members))) {
goto error;
}
@ -334,7 +313,7 @@ static RAnalBaseType *get_union_type(RAnal *anal, const char *sname) {
RAnalUnionMember cas = { .name = strdup (cur), .type = strdup (value) };
free (values);
void *element = r_vector_push (&members, &cas); // returns null if no space available
void *element = r_vector_push (members, &cas); // returns null if no space available
if (!element) {
goto error;
}
@ -342,15 +321,12 @@ static RAnalBaseType *get_union_type(RAnal *anal, const char *sname) {
sdb_aforeach_next (cur);
}
free (sdb_members);
base_union.members = members;
base_type->union_data = base_union;
return base_type;
error:
free (base_type);
r_anal_free_base_type (base_type);
free (sdb_members);
r_vector_fini (&members);
return NULL;
}
@ -641,6 +617,20 @@ R_API RAnalBaseType *r_anal_new_base_type(RAnalBaseTypeKind kind) {
return NULL;
}
type->kind = kind;
switch (type->kind) {
case R_ANAL_BASE_TYPE_KIND_STRUCT:
r_vector_init (&type->struct_data.members, sizeof (RAnalStructMember), struct_type_member_free, NULL);
break;
case R_ANAL_BASE_TYPE_KIND_ENUM:
r_vector_init (&type->enum_data.cases, sizeof (RAnalEnumCase), enum_type_case_free, NULL);
break;
case R_ANAL_BASE_TYPE_KIND_UNION:
r_vector_init (&type->union_data.members, sizeof (RAnalUnionMember), union_type_member_free, NULL);
break;
default:
break;
}
return type;
}

10
test/unit/test_anal_types.c
View File

@ -66,9 +66,8 @@ static bool test_anal_get_base_type_struct(void) {
mu_assert_streq (member->type, "int32_t", "Incorrect type for struct member");
mu_assert_streq (member->name, "cow", "Incorrect name for struct member");
r_vector_fini (&base->struct_data.members);
r_anal_free_base_type (base);
r_anal_free (anal);
free (base);
mu_end;
}
@ -94,9 +93,8 @@ static bool test_anal_get_base_type_union(void) {
mu_assert_streq (member->type, "int32_t", "Incorrect type for union member");
mu_assert_streq (member->name, "cow", "Incorrect name for union member");
r_vector_fini (&base->union_data.members);
r_anal_free_base_type (base);
r_anal_free (anal);
free (base);
mu_end;
}
@ -122,9 +120,8 @@ static bool test_anal_get_base_type_enum(void) {
mu_assert_eq (cas->val, 2, "Incorrect value for enum case");
mu_assert_streq (cas->name, "secondCase", "Incorrect name for enum case");
r_vector_fini (&base->enum_data.cases);
r_anal_free_base_type (base);
r_anal_free (anal);
free (base);
mu_end;
}
@ -147,7 +144,6 @@ static bool test_anal_get_base_type_not_found(void) {
mu_assert_null (base, "Should find nothing");
r_anal_free (anal);
free (base);
mu_end;
}