Revert "[TO BE REVERTED] Fix memory leaks in linux heap parser (#4426)"

This reverts commit 081b3d9.
rizinorg · May 3, 2024 · 0cd5349 · 0cd5349
1 parent 0498345
commit 0cd5349
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/librz/bin/bin.c b/librz/bin/bin.c
@@ -203,8 +203,13 @@ RZ_API void rz_bin_reloc_free(RZ_NULLABLE RzBinReloc *reloc) {
 	if (!reloc) {
 		return;
 	}
-	rz_bin_import_free(reloc->import);
-	rz_bin_symbol_free(reloc->symbol);
+	/**
+	 * TODO: leak in bin_elf, but it will cause double free in bin_pe if free here,
+	 * Because in the bin_elf implementation RzBinObject->imports and RzBinObject->relocs->imports
+	 * are two pieces of data, but they are linked to each other in bin_pe
+	 */
+	//	rz_bin_import_free(reloc->import);
+	//	rz_bin_symbol_free(reloc->symbol);
 	free(reloc);
 }
 

diff --git a/librz/bin/format/mdmp/mdmp_pe.c b/librz/bin/format/mdmp/mdmp_pe.c
@@ -134,7 +134,7 @@ RzPVector /*<RzBinImport *>*/ *PE_(rz_bin_mdmp_pe_get_imports)(struct PE_(rz_bin
 			offset -= pe_bin->vaddr;
 		}
 		rel->additive = 0;
-		rel->import = rz_bin_import_clone(ptr);
+		rel->import = ptr;
 		rel->addend = 0;
 		rel->vaddr = offset + pe_bin->vaddr;
 		rel->paddr = imports[i].paddr + pe_bin->paddr;

diff --git a/librz/bin/p/bin_mach0.c b/librz/bin/p/bin_mach0.c
@@ -408,11 +408,9 @@ static RzPVector /*<RzBinReloc *>*/ *relocs(RzBinFile *bf) {
 				free(ptr);
 				break;
 			}
-			ptr->import = rz_bin_import_clone(imp);
+			ptr->import = imp;
 		} else if (reloc->ord >= 0 && reloc->ord < rz_pvector_len(&bin->imports_by_ord)) {
-			RzBinImport *imp = NULL;
-			imp = rz_pvector_at(&bin->imports_by_ord, reloc->ord);
-			ptr->import = rz_bin_import_clone(imp);
+			ptr->import = rz_pvector_at(&bin->imports_by_ord, reloc->ord);
 		}
 		ptr->addend = reloc->addend;
 		ptr->vaddr = reloc->addr;

diff --git a/librz/bin/p/bin_pe.inc b/librz/bin/p/bin_pe.inc
@@ -474,7 +474,7 @@ static RzPVector /*<RzBinImport *>*/ *imports(RzBinFile *bf) {
 		rel->type = RZ_BIN_RELOC_32;
 #endif
 		rel->additive = 0;
-		rel->import = rz_bin_import_clone(ptr);
+		rel->import = ptr;
 		rel->addend = 0;
 		{
 			ut8 addr[4];

diff --git a/librz/debug/p/native/linux/linux_debug.c b/librz/debug/p/native/linux/linux_debug.c
@@ -903,8 +903,7 @@ RZ_API ut64 get_linux_tls_val(RZ_NONNULL RzDebug *dbg, int tid) {
 	} else {
 		tls = rz_reg_get_value(dbg->reg, ri);
 	}
-#endif
-#if __aarch64__
+#elif __aarch64__
 	struct iovec iovec = { 0 };
 	ut64 reg;
 

diff --git a/test/db/formats/pe/imports_tinyW7 b/test/db/formats/pe/imports_tinyW7
@@ -18,7 +18,7 @@ vaddr      paddr      type   name
 0x800004f4 0x00000234 SET_32 msvcrt_Ordinal_1268
 nth  vaddr      bind type lib      name         
 ------------------------------------------------
-284  0x00401048 NONE FUNC kernel32 Ordinal_284
+284  ---------- NONE FUNC kernel32 FindAtomW
 1268 0x00401034 NONE FUNC msvcrt   Ordinal_1268
 EOF
 RUN