Fix some ELF/Dwarf memleaks reported by Coverity

mkopec3 · Apr 29, 2015 · 40de063 · 40de063
1 parent 1c33214
commit 40de063
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/libr/bin/dwarf.c b/libr/bin/dwarf.c
@@ -255,6 +255,7 @@ static const ut8 *r_bin_dwarf_parse_lnp_header (
 		char *str = r_str_ndup ((const char *)buf, len);
 		if (len<1 || len >= 0xfff) {
 			buf += 1;
+			free (str);
 			break;
 		}
 		if (f) fprintf (f, "INCLUDEDIR (%s)\n", buf);

diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
@@ -254,10 +254,14 @@ static int Elf_(r_bin_elf_init_dynamic_section) (struct Elf_(r_bin_elf_obj_t) *b
 	dyn = (Elf_(Dyn)*)calloc (entries, sizeof (Elf_(Dyn)));
 	if (!dyn) return R_FALSE;
 
-	if (!UT32_MUL (&dyn_size, entries, sizeof (Elf_(Dyn))))
+	if (!UT32_MUL (&dyn_size, entries, sizeof (Elf_(Dyn)))) {
+		free (dyn);
 		return R_FALSE;
-	if (!dyn_size)
+	}
+	if (!dyn_size) {
+		free (dyn);
 		return R_FALSE;
+	}
 	if (bin->phdr[i].p_offset + dyn_size > bin->size){
 		free (dyn);
 		return R_FALSE;