Attempt to fix radareorg#10693 issue.

jhscheer · Jul 17, 2018 · c5ec231 · c5ec231
1 parent 927bfba
commit c5ec231
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/libr/core/canal.c b/libr/core/canal.c
@@ -3600,6 +3600,7 @@ R_API void r_core_anal_fcn_merge (RCore *core, ut64 addr, ut64 addr2) {
 	RAnalBlock *bb;
 	RAnalFunction *f1 = r_anal_get_fcn_at (core->anal, addr, 0);
 	RAnalFunction *f2 = r_anal_get_fcn_at (core->anal, addr2, 0);
+	RAnalFunction *f3 = NULL;
 	if (!f1 || !f2) {
 		eprintf ("Cannot find function\n");
 		return;
@@ -3647,7 +3648,12 @@ R_API void r_core_anal_fcn_merge (RCore *core, ut64 addr, ut64 addr2) {
 	// resize
 	f2->bbs = NULL;
 	r_anal_fcn_tree_delete (&core->anal->fcn_tree, f2);
-	r_list_delete_data (core->anal->fcns, f2);
+	r_list_foreach (core->anal->fcns, iter, f2) {
+		if (f2 == f3) {
+			r_list_delete (core->anal->fcns, iter);
+			f3->bbs = NULL;
+		}
+	}
 }
 
 R_API void r_core_anal_auto_merge (RCore *core, ut64 addr) {

diff --git a/libr/util/list.c b/libr/util/list.c
@@ -594,11 +594,11 @@ int main () {
 
 	{
 		char *str;
-		r_list_foreach(l, iter, str) {
+		r_list_foreach (l, iter, str) {
 			printf("-- %s\n", str);
 		}
 		printf("--**--\n");
-		r_list_foreach_prev(l, iter, str) {
+		r_list_foreach_prev (l, iter, str) {
 			printf("-- %s\n", str);
 		}
 	}