From 05ee0962800a8afa1b609e8d08ff87b3b986c357 Mon Sep 17 00:00:00 2001 From: Marco Grassi Date: Fri, 21 Feb 2020 18:05:55 +0800 Subject: [PATCH] Fix null pointer in bobj.c (#16015) * fixing memory leaks * use the return if macro * removed redundand checks * fixed some out of bound accesses * fixed null pointer bug in bobj --- libr/bin/bobj.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libr/bin/bobj.c b/libr/bin/bobj.c index 5784ba6065..7fdef561f0 100644 --- a/libr/bin/bobj.c +++ b/libr/bin/bobj.c @@ -256,11 +256,13 @@ static void r_bin_object_rebuild_classes_ht(RBinObject *o) { RBinClass *klass; RBinSymbol *method; r_list_foreach (o->classes, it, klass) { - ht_pp_insert (o->classes_ht, klass->name, klass); + if (klass->name) { + ht_pp_insert (o->classes_ht, klass->name, klass); - r_list_foreach (klass->methods, it2, method) { - const char *name = sdb_fmt ("%s::%s", klass->name, method->name); - ht_pp_insert (o->methods_ht, name, method); + r_list_foreach (klass->methods, it2, method) { + const char *name = sdb_fmt ("%s::%s", klass->name, method->name); + ht_pp_insert (o->methods_ht, name, method); + } } } }