Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

analysis/meta: minor cleanup #3948

Merged
merged 1 commit into from
Nov 6, 2023
Merged

analysis/meta: minor cleanup #3948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions librz/analysis/analysis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,13 @@ void rz_analysis_hint_storage_init(RzAnalysis *a);

void rz_analysis_hint_storage_fini(RzAnalysis *a);

static void rz_meta_item_fini(RzAnalysisMetaItem *item) {
free(item->str);
}

static void rz_meta_item_free(void *_item) {
if (_item) {
RzAnalysisMetaItem *item = _item;
rz_meta_item_fini(item);
free(item);
static void meta_item_free(void *item) {
if (!item) {
return;
}
RzAnalysisMetaItem *it = item;
free(it->str);
free(it);
}

static void global_kv_free(HtPPKv *kv) {
Expand Down Expand Up @@ -88,7 +85,7 @@ RZ_API RzAnalysis *rz_analysis_new(void) {
rz_event_hook(analysis->meta_spaces.event, RZ_SPACE_EVENT_COUNT, meta_count_for, NULL);

rz_analysis_hint_storage_init(analysis);
rz_interval_tree_init(&analysis->meta, rz_meta_item_free);
rz_interval_tree_init(&analysis->meta, meta_item_free);
analysis->typedb = rz_type_db_new();
analysis->sdb_fmts = sdb_ns(analysis->sdb, "spec", 1);
analysis->sdb_cc = sdb_ns(analysis->sdb, "cc", 1);
Expand Down Expand Up @@ -448,7 +445,7 @@ RZ_API bool rz_analysis_op_is_eob(RzAnalysisOp *op) {
RZ_API void rz_analysis_purge(RzAnalysis *analysis) {
rz_analysis_hint_clear(analysis);
rz_interval_tree_fini(&analysis->meta);
rz_interval_tree_init(&analysis->meta, rz_meta_item_free);
rz_interval_tree_init(&analysis->meta, meta_item_free);
rz_type_db_purge(analysis->typedb);
sdb_reset(analysis->sdb_classes);
sdb_reset(analysis->sdb_classes_attrs);
Expand Down
5 changes: 3 additions & 2 deletions librz/analysis/meta.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ static bool meta_set(RzAnalysis *a, RzAnalysisMetaType type, int subtype, ut64 f
item->size = to - from + 1;
free(item->str);
if (is_string_with_zeroes(type, subtype)) {
item->str = str ? rz_str_ndup(str, item->size) : NULL;
item->str = rz_str_ndup(str, item->size);
} else {
item->str = str ? strdup(str) : NULL;
}
Expand All @@ -138,7 +138,8 @@ static bool meta_set(RzAnalysis *a, RzAnalysisMetaType type, int subtype, ut64 f
return true;
}

RZ_API bool rz_meta_set_string(RzAnalysis *a, RzAnalysisMetaType type, ut64 addr, const char *s) {
RZ_API bool rz_meta_set_string(RzAnalysis *a, RzAnalysisMetaType type, ut64 addr, RZ_NULLABLE const char *s) {
rz_return_val_if_fail(a, false);
// By default all strings are UTF-8
return meta_set(a, type, RZ_STRING_ENC_UTF8, addr, addr, s);
}
Expand Down
2 changes: 1 addition & 1 deletion librz/include/rz_analysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2029,7 +2029,7 @@ RZ_API bool rz_meta_set_with_subtype(RzAnalysis *m, RzAnalysisMetaType type, int
RZ_API void rz_meta_del(RzAnalysis *a, RzAnalysisMetaType type, ut64 addr, ut64 size);

// Same as rz_meta_set() with a size of 1.
RZ_API bool rz_meta_set_string(RzAnalysis *a, RzAnalysisMetaType type, ut64 addr, const char *s);
RZ_API bool rz_meta_set_string(RzAnalysis *a, RzAnalysisMetaType type, ut64 addr, RZ_NULLABLE const char *s);

// Convenience function to get the str content of the item at addr with given type in the current space.
RZ_API const char *rz_meta_get_string(RzAnalysis *a, RzAnalysisMetaType type, ut64 addr);
Expand Down
Loading