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

Remove length restrictions in analysis classes and various serializations (#1718)

Browse source
This commit is contained in:
Florian Märkl 2021-09-18 16:48:14 +02:00 committed by GitHub
parent fe9e1beed9
commit 65d567282b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 308 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

301
librz/analysis/class.c
View file

@ -20,19 +20,19 @@ static const char *key_class(const char *name) {
}
static char *key_attr_types(const char *name) {
return sdb_fmt("attrtypes.%s", name);
return rz_str_newf("attrtypes.%s", name);
}
static char *key_attr_type_attrs(const char *class_name, const char *attr_type) {
return sdb_fmt("attr.%s.%s", class_name, attr_type);
return rz_str_newf("attr.%s.%s", class_name, attr_type);
}
static char *key_attr_content(const char *class_name, const char *attr_type, const char *attr_id) {
return sdb_fmt("attr.%s.%s.%s", class_name, attr_type, attr_id);
return rz_str_newf("attr.%s.%s.%s", class_name, attr_type, attr_id);
}
static char *key_attr_content_specific(const char *class_name, const char *attr_type, const char *attr_id) {
return sdb_fmt("attr.%s.%s.%s.specific", class_name, attr_type, attr_id);
return rz_str_newf("attr.%s.%s.%s.specific", class_name, attr_type, attr_id);
}
typedef enum {
@ -108,20 +108,35 @@ RZ_API void rz_analysis_class_delete(RzAnalysis *analysis, const char *name) {
}
char *key = key_attr_types(class_name_sanitized);
if (!key) {
free(class_name_sanitized);
return;
}
char *attr_type_array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
char *attr_type;
sdb_aforeach(attr_type, attr_type_array) {
key = key_attr_type_attrs(class_name_sanitized, attr_type);
if (!key) {
continue;
}
char *attr_id_array = sdb_get(analysis->sdb_classes_attrs, key, 0);
sdb_remove(analysis->sdb_classes_attrs, key, 0);
free(key);
if (attr_id_array) {
char *attr_id;
sdb_aforeach(attr_id, attr_id_array) {
key = key_attr_content(class_name_sanitized, attr_type, attr_id);
sdb_remove(analysis->sdb_classes_attrs, key, 0);
if (key) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
free(key);
}
key = key_attr_content_specific(class_name_sanitized, attr_type, attr_id);
sdb_remove(analysis->sdb_classes_attrs, key, 0);
if (key) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
free(key);
}
sdb_aforeach_next(attr_id);
}
free(attr_id_array);
@ -130,7 +145,11 @@ RZ_API void rz_analysis_class_delete(RzAnalysis *analysis, const char *name) {
}
free(attr_type_array);
sdb_remove(analysis->sdb_classes_attrs, key_attr_types(class_name_sanitized), 0);
key = key_attr_types(class_name_sanitized);
if (key) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
free(key);
}
RzEventClass event = { .name = class_name_sanitized };
rz_event_send(analysis->ev, RZ_EVENT_CLASS_DEL, &event);
@ -197,26 +216,47 @@ RZ_API RzAnalysisClassErr rz_analysis_class_rename(RzAnalysis *analysis, const c
goto beach;
}
char *attr_types = sdb_get(analysis->sdb_classes_attrs, key_attr_types(old_name_sanitized), 0);
char *attr_type_cur;
sdb_aforeach(attr_type_cur, attr_types) {
char *attr_ids = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(old_name, attr_type_cur), 0);
char *attr_id_cur;
sdb_aforeach(attr_id_cur, attr_ids) {
rename_key(analysis->sdb_classes_attrs,
key_attr_content(old_name, attr_type_cur, attr_id_cur),
key_attr_content(new_name, attr_type_cur, attr_id_cur));
sdb_aforeach_next(attr_id_cur);
char *key = key_attr_types(old_name_sanitized);
if (key) {
char *attr_types = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
char *attr_type_cur;
sdb_aforeach(attr_type_cur, attr_types) {
char *key = key_attr_type_attrs(old_name, attr_type_cur);
if (!key) {
continue;
}
char *attr_ids = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
char *attr_id_cur;
sdb_aforeach(attr_id_cur, attr_ids) {
key = key_attr_content(old_name, attr_type_cur, attr_id_cur);
char *new_key = key_attr_content(new_name, attr_type_cur, attr_id_cur);
if (key && new_key) {
rename_key(analysis->sdb_classes_attrs, key, new_key);
}
free(key);
free(new_key);
sdb_aforeach_next(attr_id_cur);
}
free(attr_ids);
key = key_attr_type_attrs(old_name, attr_type_cur);
char *new_key = key_attr_type_attrs(new_name, attr_type_cur);
if (key && new_key) {
rename_key(analysis->sdb_classes_attrs, key, new_key);
}
sdb_aforeach_next(attr_type_cur);
}
free(attr_ids);
rename_key(analysis->sdb_classes_attrs,
key_attr_type_attrs(old_name, attr_type_cur),
key_attr_type_attrs(new_name, attr_type_cur));
sdb_aforeach_next(attr_type_cur);
free(attr_types);
}
free(attr_types);
rename_key(analysis->sdb_classes_attrs, key_attr_types(old_name_sanitized), key_attr_types(new_name_sanitized));
key = key_attr_types(old_name_sanitized);
char *new_key = key_attr_types(new_name_sanitized);
if (key && new_key) {
rename_key(analysis->sdb_classes_attrs, key, new_key);
}
free(key);
free(new_key);
RzEventClassRename event = {
.name_old = old_name_sanitized,
@ -236,7 +276,11 @@ static char *rz_analysis_class_get_attr_raw(RzAnalysis *analysis, const char *cl
char *key = specific
? key_attr_content_specific(class_name, attr_type_str, attr_id)
: key_attr_content(class_name, attr_type_str, attr_id);
if (!key) {
return NULL;
}
char *ret = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
return ret;
}
@ -268,9 +312,21 @@ static RzAnalysisClassErr rz_analysis_class_set_attr_raw(RzAnalysis *analysis, c
return RZ_ANALYSIS_CLASS_ERR_NONEXISTENT_CLASS;
}
sdb_array_add(analysis->sdb_classes_attrs, key_attr_types(class_name), attr_type_str, 0);
sdb_array_add(analysis->sdb_classes_attrs, key_attr_type_attrs(class_name, attr_type_str), attr_id, 0);
sdb_set(analysis->sdb_classes_attrs, key_attr_content(class_name, attr_type_str, attr_id), content, 0);
char *key = key_attr_types(class_name);
if (key) {
sdb_array_add(analysis->sdb_classes_attrs, key, attr_type_str, 0);
free(key);
}
key = key_attr_type_attrs(class_name, attr_type_str);
if (key) {
sdb_array_add(analysis->sdb_classes_attrs, key, attr_id, 0);
free(key);
}
key = key_attr_content(class_name, attr_type_str, attr_id);
if (key) {
sdb_set(analysis->sdb_classes_attrs, key, content, 0);
free(key);
}
RzEventClassAttrSet event = {
.attr = {
@ -309,14 +365,23 @@ static RzAnalysisClassErr rz_analysis_class_delete_attr_raw(RzAnalysis *analysis
const char *attr_type_str = attr_type_id(attr_type);
char *key = key_attr_content(class_name, attr_type_str, attr_id);
sdb_remove(analysis->sdb_classes_attrs, key, 0);
if (key) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
free(key);
}
key = key_attr_content_specific(class_name, attr_type_str, attr_id);
sdb_remove(analysis->sdb_classes_attrs, key, 0);
if (key) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
free(key);
}
key = key_attr_type_attrs(class_name, attr_type_str);
sdb_array_remove(analysis->sdb_classes_attrs, key, attr_id, 0);
if (!sdb_exists(analysis->sdb_classes_attrs, key)) {
sdb_array_remove(analysis->sdb_classes_attrs, key_attr_types(class_name), attr_type_str, 0);
if (key) {
sdb_array_remove(analysis->sdb_classes_attrs, key, attr_id, 0);
if (!sdb_exists(analysis->sdb_classes_attrs, key)) {
sdb_array_remove(analysis->sdb_classes_attrs, key_attr_types(class_name), attr_type_str, 0);
}
free(key);
}
RzEventClassAttr event = {
@ -351,33 +416,45 @@ static RzAnalysisClassErr rz_analysis_class_delete_attr(RzAnalysis *analysis, co
static RzAnalysisClassErr rz_analysis_class_rename_attr_raw(RzAnalysis *analysis, const char *class_name, RzAnalysisClassAttrType attr_type, const char *attr_id_old, const char *attr_id_new) {
const char *attr_type_str = attr_type_id(attr_type);
char *key = key_attr_type_attrs(class_name, attr_type_str);
if (!key) {
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
if (sdb_array_contains(analysis->sdb_classes_attrs, key, attr_id_new, 0)) {
free(key);
return RZ_ANALYSIS_CLASS_ERR_CLASH;
}
if (!sdb_array_remove(analysis->sdb_classes_attrs, key, attr_id_old, 0)) {
free(key);
return RZ_ANALYSIS_CLASS_ERR_NONEXISTENT_ATTR;
}
sdb_array_add(analysis->sdb_classes_attrs, key, attr_id_new, 0);
free(key);
key = key_attr_content(class_name, attr_type_str, attr_id_old);
char *content = sdb_get(analysis->sdb_classes_attrs, key, 0);
if (content) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
key = key_attr_content(class_name, attr_type_str, attr_id_new);
sdb_set(analysis->sdb_classes_attrs, key, content, 0);
free(content);
if (key) {
char *content = sdb_get(analysis->sdb_classes_attrs, key, 0);
if (content) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
key = key_attr_content(class_name, attr_type_str, attr_id_new);
sdb_set(analysis->sdb_classes_attrs, key, content, 0);
free(content);
}
free(key);
}
key = key_attr_content_specific(class_name, attr_type_str, attr_id_old);
content = sdb_get(analysis->sdb_classes_attrs, key, 0);
if (content) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
key = key_attr_content_specific(class_name, attr_type_str, attr_id_new);
sdb_set(analysis->sdb_classes_attrs, key, content, 0);
free(content);
if (key) {
char *content = sdb_get(analysis->sdb_classes_attrs, key, 0);
if (content) {
sdb_remove(analysis->sdb_classes_attrs, key, 0);
key = key_attr_content_specific(class_name, attr_type_str, attr_id_new);
sdb_set(analysis->sdb_classes_attrs, key, content, 0);
free(content);
}
free(key);
}
RzEventClassAttrRename event = {
@ -418,10 +495,14 @@ static RzAnalysisClassErr rz_analysis_class_rename_attr(RzAnalysis *analysis, co
static void rz_analysis_class_unique_attr_id_raw(RzAnalysis *analysis, const char *class_name, RzAnalysisClassAttrType attr_type, char *out, size_t out_size) {
ut64 id = 0;
char *key = key_attr_type_attrs(class_name, attr_type_id(attr_type));
if (!key) {
return;
}
do {
snprintf(out, out_size, "%" PFMT64u, id);
id++;
} while (sdb_array_contains(analysis->sdb_classes_attrs, key, out, 0));
free(key);
}
static char *flagname_attr(const char *attr_type, const char *class_name, const char *attr_id) {
@ -434,7 +515,7 @@ static char *flagname_attr(const char *attr_type, const char *class_name, const
free(class_name_sanitized);
return NULL;
}
char *r = sdb_fmt("%s.%s.%s", attr_type, class_name, attr_id);
char *r = rz_str_newf("%s.%s.%s", attr_type, class_name, attr_id);
free(class_name_sanitized);
free(attr_id_sanitized);
return r;
@ -608,10 +689,18 @@ RZ_API RzAnalysisClassErr rz_analysis_class_method_get(RzAnalysis *analysis, con
meth->addr = rz_num_math(NULL, cur);
cur = next;
if (!cur) {
free(content);
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
sdb_anext(cur, &next);
meth->vtable_offset = atoll(cur);
cur = next;
if (!cur) {
free(content);
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
sdb_anext(cur, &next);
meth->method_type = rz_num_math(NULL, cur);
cur = next;
@ -651,7 +740,12 @@ RZ_API RzVector /*<RzAnalysisMethod>*/ *rz_analysis_class_method_get_all(RzAnaly
rz_vector_free(vec);
return NULL;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(class_name_sanitized, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD)), 0);
char *key = key_attr_type_attrs(class_name_sanitized, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD));
if (!key) {
return NULL;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
free(class_name_sanitized);
rz_vector_reserve(vec, (size_t)sdb_alen(array));
@ -669,12 +763,20 @@ RZ_API RzVector /*<RzAnalysisMethod>*/ *rz_analysis_class_method_get_all(RzAnaly
}
RZ_API RzAnalysisClassErr rz_analysis_class_method_set(RzAnalysis *analysis, const char *class_name, RzAnalysisMethod *meth) {
char *content = sdb_fmt("%" PFMT64u "%c%" PFMT64d "%c%" PFMT32u "%c%s", meth->addr, SDB_RS, meth->vtable_offset, SDB_RS, meth->method_type, SDB_RS, meth->real_name);
char *content = rz_str_newf("%" PFMT64u "%c%" PFMT64d "%c%" PFMT32u "%c%s", meth->addr, SDB_RS, meth->vtable_offset, SDB_RS, meth->method_type, SDB_RS, meth->real_name);
if (!content) {
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
RzAnalysisClassErr err = rz_analysis_class_set_attr(analysis, class_name, RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD, meth->name, content);
free(content);
if (err != RZ_ANALYSIS_CLASS_ERR_SUCCESS) {
return err;
}
rz_analysis_class_set_flag(analysis, flagname_method(class_name, meth->name), meth->addr, 0);
char *fn = flagname_method(class_name, meth->name);
if (fn) {
rz_analysis_class_set_flag(analysis, fn, meth->addr, 0);
free(fn);
}
return RZ_ANALYSIS_CLASS_ERR_SUCCESS;
}
@ -690,35 +792,56 @@ RZ_API RzAnalysisClassErr rz_analysis_class_method_rename(RzAnalysis *analysis,
if (err != RZ_ANALYSIS_CLASS_ERR_SUCCESS) {
return err;
}
rz_analysis_class_rename_flag(analysis,
flagname_method(class_name, old_meth_name),
flagname_method(class_name, new_meth_name));
char *old_fn = flagname_method(class_name, old_meth_name);
char *new_fn = flagname_method(class_name, new_meth_name);
if (old_fn && new_fn) {
rz_analysis_class_rename_flag(analysis, old_fn, new_fn);
}
free(old_fn);
free(new_fn);
return RZ_ANALYSIS_CLASS_ERR_SUCCESS;
}
static void rz_analysis_class_method_rename_class(RzAnalysis *analysis, const char *old_class_name, const char *new_class_name) {
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(old_class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD)), 0);
char *key = key_attr_type_attrs(old_class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD));
if (!key) {
return;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
if (!array) {
return;
}
char *cur;
sdb_aforeach(cur, array) {
rz_analysis_class_rename_flag(analysis,
flagname_method(old_class_name, cur),
flagname_method(new_class_name, cur));
char *old_fn = flagname_method(old_class_name, cur);
char *new_fn = flagname_method(new_class_name, cur);
if (old_fn && new_fn) {
rz_analysis_class_rename_flag(analysis, old_fn, new_fn);
}
free(old_fn);
free(new_fn);
sdb_aforeach_next(cur);
}
free(array);
}
static void rz_analysis_class_method_delete_class(RzAnalysis *analysis, const char *class_name) {
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD)), 0);
char *key = key_attr_type_attrs(class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD));
if (!key) {
return;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
if (!array) {
return;
}
char *cur;
sdb_aforeach(cur, array) {
rz_analysis_class_unset_flag(analysis, flagname_method(class_name, cur));
char *fn = flagname_method(class_name, cur);
if (fn) {
rz_analysis_class_unset_flag(analysis, fn);
}
free(fn);
sdb_aforeach_next(cur);
}
free(array);
@ -736,7 +859,11 @@ RZ_API RzAnalysisClassErr rz_analysis_class_method_delete(RzAnalysis *analysis,
}
RzAnalysisClassErr err = rz_analysis_class_delete_attr_raw(analysis, class_name_sanitized, RZ_ANALYSIS_CLASS_ATTR_TYPE_METHOD, meth_name_sanitized);
if (err == RZ_ANALYSIS_CLASS_ERR_SUCCESS) {
rz_analysis_class_unset_flag(analysis, flagname_method(class_name_sanitized, meth_name_sanitized));
char *fn = flagname_method(class_name_sanitized, meth_name_sanitized);
if (fn) {
rz_analysis_class_unset_flag(analysis, fn);
}
free(fn);
}
free(class_name_sanitized);
free(meth_name_sanitized);
@ -804,7 +931,14 @@ RZ_API RzVector /*<RzAnalysisBaseClass>*/ *rz_analysis_class_base_get_all(RzAnal
rz_vector_free(vec);
return NULL;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(class_name_sanitized, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_BASE)), 0);
char *key = key_attr_type_attrs(class_name_sanitized, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_BASE));
if (!key) {
rz_vector_free(vec);
free(class_name_sanitized);
return NULL;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
free(class_name_sanitized);
rz_vector_reserve(vec, (size_t)sdb_alen(array));
@ -822,7 +956,10 @@ RZ_API RzVector /*<RzAnalysisBaseClass>*/ *rz_analysis_class_base_get_all(RzAnal
}
static RzAnalysisClassErr rz_analysis_class_base_set_raw(RzAnalysis *analysis, const char *class_name, RzAnalysisBaseClass *base, const char *base_class_name_sanitized) {
char *content = sdb_fmt("%s" SDB_SS "%" PFMT64u, base_class_name_sanitized, base->offset);
char *content = rz_str_newf("%s" SDB_SS "%" PFMT64u, base_class_name_sanitized, base->offset);
if (!content) {
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
RzAnalysisClassErr err;
if (base->id) {
err = rz_analysis_class_set_attr(analysis, class_name, RZ_ANALYSIS_CLASS_ATTR_TYPE_BASE, base->id, content);
@ -834,6 +971,7 @@ static RzAnalysisClassErr rz_analysis_class_base_set_raw(RzAnalysis *analysis, c
err = RZ_ANALYSIS_CLASS_ERR_OTHER;
}
}
free(content);
return err;
}
@ -983,7 +1121,14 @@ RZ_API RzVector /*<RzAnalysisVTable>*/ *rz_analysis_class_vtable_get_all(RzAnaly
rz_vector_free(vec);
return NULL;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(class_name_sanitized, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE)), 0);
char *key = key_attr_type_attrs(class_name_sanitized, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE));
if (!key) {
rz_vector_free(vec);
free(class_name_sanitized);
return NULL;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
free(class_name_sanitized);
rz_vector_reserve(vec, (size_t)sdb_alen(array));
@ -1014,9 +1159,14 @@ RZ_API RzAnalysisClassErr rz_analysis_class_vtable_set(RzAnalysis *analysis, con
}
rz_vector_free(vtables);
char *content = sdb_fmt("0x%" PFMT64x SDB_SS "%" PFMT64u SDB_SS "%" PFMT64u, vtable->addr, vtable->offset, vtable->size);
char *content = rz_str_newf("0x%" PFMT64x SDB_SS "%" PFMT64u SDB_SS "%" PFMT64u, vtable->addr, vtable->offset, vtable->size);
if (!content) {
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
if (vtable->id) {
return rz_analysis_class_set_attr(analysis, class_name, RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE, vtable->id, content);
RzAnalysisClassErr r = rz_analysis_class_set_attr(analysis, class_name, RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE, vtable->id, content);
free(content);
return r;
}
vtable->id = malloc(16);
@ -1024,6 +1174,7 @@ RZ_API RzAnalysisClassErr rz_analysis_class_vtable_set(RzAnalysis *analysis, con
return RZ_ANALYSIS_CLASS_ERR_OTHER;
}
RzAnalysisClassErr err = rz_analysis_class_add_attr_unique(analysis, class_name, RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE, content, vtable->id, 16);
free(content);
if (err != RZ_ANALYSIS_CLASS_ERR_SUCCESS) {
return err;
}
@ -1034,22 +1185,36 @@ RZ_API RzAnalysisClassErr rz_analysis_class_vtable_set(RzAnalysis *analysis, con
}
static void rz_analysis_class_vtable_rename_class(RzAnalysis *analysis, const char *old_class_name, const char *new_class_name) {
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(old_class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE)), 0);
char *key = key_attr_type_attrs(old_class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE));
if (!key) {
return;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
if (!array) {
return;
}
char *cur;
sdb_aforeach(cur, array) {
rz_analysis_class_rename_flag(analysis,
flagname_vtable(old_class_name, cur),
flagname_vtable(new_class_name, cur));
char *old_fn = flagname_vtable(old_class_name, cur);
char *new_fn = flagname_vtable(new_class_name, cur);
if (old_fn && new_fn) {
rz_analysis_class_rename_flag(analysis, old_fn, new_fn);
}
free(old_fn);
free(new_fn);
sdb_aforeach_next(cur);
}
free(array);
}
static void rz_analysis_class_vtable_delete_class(RzAnalysis *analysis, const char *class_name) {
char *array = sdb_get(analysis->sdb_classes_attrs, key_attr_type_attrs(class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE)), 0);
char *key = key_attr_type_attrs(class_name, attr_type_id(RZ_ANALYSIS_CLASS_ATTR_TYPE_VTABLE));
if (!key) {
return;
}
char *array = sdb_get(analysis->sdb_classes_attrs, key, 0);
free(key);
if (!array) {
return;
}

12
librz/type/serialize_functions.c
View file

@ -54,15 +54,15 @@ static RzCallable *get_callable_type(RzTypeDB *typedb, Sdb *sdb, const char *nam
return NULL;
}
char key[SDB_MAX_KEY + 1];
size_t arguments = sdb_num_get(sdb, rz_strf(key, "func.%s.args", name), 0);
RzStrBuf key;
size_t arguments = sdb_num_get(sdb, rz_strbuf_initf(&key, "func.%s.args", name), 0);
if (arguments > 0 && !rz_pvector_reserve(callable->args, arguments)) {
goto error;
}
int i;
for (i = 0; i < arguments; i++) {
char *values = sdb_get(sdb, rz_strf(key, "func.%s.arg.%d", name, i), NULL);
char *values = sdb_get(sdb, rz_strbuf_setf(&key, "func.%s.arg.%d", name, i), NULL);
if (!values) {
goto error;
@ -98,7 +98,7 @@ static RzCallable *get_callable_type(RzTypeDB *typedb, Sdb *sdb, const char *nam
}
}
const char *rettype = sdb_const_get(sdb, rz_strf(key, "func.%s.ret", name), 0);
const char *rettype = sdb_const_get(sdb, rz_strbuf_setf(&key, "func.%s.ret", name), 0);
if (!rettype) {
// best we can do for a broken database
rettype = "void";
@ -114,8 +114,9 @@ static RzCallable *get_callable_type(RzTypeDB *typedb, Sdb *sdb, const char *nam
callable->ret = ttype;
// Optional "noreturn" attribute
callable->noret = sdb_bool_get(sdb, rz_strf(key, "func.%s.noreturn", name), 0);
callable->noret = sdb_bool_get(sdb, rz_strbuf_setf(&key, "func.%s.noreturn", name), 0);
rz_strbuf_fini(&key);
rz_list_free(cache_newly_added);
return callable;
@ -124,6 +125,7 @@ error:
type_string_cache_rollback(type_str_cache, cache_newly_added);
rz_list_free(cache_newly_added);
rz_type_callable_free(callable);
rz_strbuf_fini(&key);
return NULL;
}

9
librz/type/serialize_types.c
View file

@ -293,16 +293,17 @@ static TypeFormatPair *get_atomic_type(RzTypeDB *typedb, Sdb *sdb, const char *s
ttype->identifier.kind = RZ_TYPE_IDENTIFIER_KIND_UNSPECIFIED;
base_type->type = ttype;
char key[SDB_MAX_KEY + 1];
base_type->name = strdup(sname);
base_type->size = sdb_num_get(sdb, rz_strf(key, "type.%s.size", sname), 0);
RzStrBuf key;
base_type->size = sdb_num_get(sdb, rz_strbuf_initf(&key, "type.%s.size", sname), 0);
RzTypeTypeclass typeclass = RZ_TYPE_TYPECLASS_NONE;
const char *tclass = sdb_const_get(sdb, rz_strf(key, "type.%s.typeclass", sname), 0);
const char *tclass = sdb_const_get(sdb, rz_strbuf_setf(&key, "type.%s.typeclass", sname), 0);
if (tclass) {
typeclass = rz_type_typeclass_from_string(tclass);
}
set_base_type_typeclass(base_type, typeclass);
const char *format = sdb_const_get(sdb, rz_strf(key, "type.%s", sname), 0);
const char *format = sdb_const_get(sdb, rz_strbuf_setf(&key, "type.%s", sname), 0);
rz_strbuf_fini(&key);
TypeFormatPair *tpair = RZ_NEW0(TypeFormatPair);
tpair->type = base_type;

2
subprojects/sdb.wrap
View file

@ -1,3 +1,3 @@
[wrap-git]
url = https://github.com/rizinorg/sdb.git
revision = c9752198549410add2bf220de40e08f018877712
revision = db7edd4a96a89b6749b677a85d7fa4ee2c6fbbb9

28
test/db/cmd/cmd_ac
View file

@ -611,3 +611,31 @@ Function address: 0x1000060a0, in C vtable 1
Function address: 0x1000060a0, in C vtable 3
EOF
RUN
NAME=longclass
FILE==
CMDS=<<EOF
ac Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline
acv Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline 0x1337 0x42
acm Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline Uluuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuumulu 0x12345
acll
k analysis/classes/*
?e -
k analysis/classes/attrs/*
EOF
EXPECT=<<EOF
[Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline]
(vtable at 0x1337 in class at +0x42)
nth name addr vt_offset type
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1 Uluuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuumulu 0x12345 -1 DEFAULT
Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline=c
-
attr.Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline.method=Uluuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuumulu
attr.Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline.method.Uluuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuumulu=74565,-1,0,Uluuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuumulu
attr.Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline.vtable=0
attr.Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline.vtable.0=0x1337,66,0
attrtypes.Flaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatline=vtable,method
EOF
RUN

34
test/db/cmd/project
View file

@ -379,3 +379,37 @@ Detailed project load info:
project migrated from version 4 to 5.
EOF
RUN
NAME=longkeys (> 256)
FILE=bins/elf/crackme0x00b
CMDS=<<EOF
s 0x08048464
af Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongname
ac Claaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
acm Claaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss Meeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeethod 0x100
Ps .tmp_longkeys.rzdb
?e --
o--
o
?e --
Po .tmp_longkeys.rzdb
rm .tmp_longkeys.rzdb
?e --
afl
acll
EOF
EXPECT=<<EOF
--
--
--
0x08048464 1 1 Loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongname
[Claaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss]
nth name addr vt_offset type
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1 Meeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeethod 0x100 -1 DEFAULT
EOF
EXPECT_ERR=<<EOF
All core files, io, analysis and flags info purged.
EOF
RUN