* Fix double-free segfault in elf parser on netbsd binaries.

* Fix bindings build
pmquang · Nov 15, 2011 · 3fd59fd · 3fd59fd
1 parent a0ed400
commit 3fd59fd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/libr/bin/format/elf/elf.c b/libr/bin/format/elf/elf.c
@@ -632,7 +632,6 @@ char *Elf_(r_bin_elf_get_rpath)(struct Elf_(r_bin_elf_obj_t) *bin) {
 			break;
 		}
 	free (dyn);
-	free (ret);
 	return ret;
 }
 

diff --git a/libr/include/r_db.h b/libr/include/r_db.h
@@ -77,6 +77,7 @@ R_API RList *r_pair_list (RPair *p, const char *domain);
 R_API void r_pair_set_sync_dir (RPair *p, const char *dir);
 R_API void r_pair_load (RPair *p);
 R_API void r_pair_sync (RPair *p);
+R_API void r_pair_reset (RPair *p);
 /* */
 R_API struct r_db_t *r_db_new();
 R_API struct r_db_block_t *r_db_block_new();

diff --git a/pkgcfg/r_core.pc.acr b/pkgcfg/r_core.pc.acr
@@ -7,5 +7,5 @@ Name: r_core
 Description: radare foundation libraries
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -lr_core -lr_config -lr_cons -lr_line -lr_io -lr_cmd -lr_util -lr_print -lr_flags -lr_asm -lr_lib -lr_debug -lr_hash -lr_bin -lr_lang -lr_io -lr_anal -lr_parse -lr_print -lr_bp -lr_egg -lr_reg -lr_search -lr_syscall -lr_sign -lr_diff -lr_socket -lr_fs @LIBMAGIC@
+Libs: -L${libdir} -lr_core -lr_config -lr_cons -lr_line -lr_io -lr_cmd -lr_util -lr_print -lr_flags -lr_asm -lr_lib -lr_debug -lr_hash -lr_bin -lr_lang -lr_io -lr_anal -lr_parse -lr_print -lr_bp -lr_egg -lr_reg -lr_search -lr_syscall -lr_sign -lr_diff -lr_socket -lr_fs @LIBMAGIC@ -lr_db
 Cflags: -I${includedir}/libr
diff --git a/r2-bindings/vapi/r_db.vapi b/r2-bindings/vapi/r_db.vapi
@@ -20,15 +20,15 @@ namespace Radare {
 	//	public uint8 *pop();
 	}
 	[Compact]
-	[CCode (cheader_filename="r_pair.h", cname="struct r_pair_t", free_function="r_pair_free", cprefix="r_pair_")]
+	[CCode (cheader_filename="r_db.h", cname="struct r_pair_t", free_function="r_pair_free", cprefix="r_pair_")]
 	public class RPair {
 		/* lifecycle */
 		public RPair();
 		public RPair.from_file(string file);
 		public void free();
 
 		/* storage */
-		public bool delete(string k);
+		public void delete(string k);
 		public string get(string k);
 		public void set (string k, string v);
 		//TODO public RList<RPairItem> list (string domain);
-Original file line number
+Diff line change
@@ Expand Up @@
     			break;
     		}
     	free (dyn);
-    	free (ret);
     	return ret;
     }
@@ Expand Down @@