l0gic's fix for an use after free in r_socket

rchiossi · Aug 29, 2012 · 0a202fc · 0a202fc
1 parent ef4217a
commit 0a202fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/libr/socket/proc.c b/libr/socket/proc.c
@@ -1,3 +1,5 @@
+/* radare - LGPL - Copyright 2007-2012 - pancake */
+
 /* XXX : move to r_util??? rename method names.. to long? */
 /* proc IO is not related to socket io.. this is shitty!! */
 
@@ -44,11 +46,12 @@ R_API struct r_socket_proc_t *r_socket_proc_open(char *const argv[]) {
 		dup2 (sp->fd1[1], 1);
 		execv (argv[0], argv);
 		exit (1);
+		break;
 	case -1:
 		perror ("fork");
 		r_socket_proc_close (sp);
 		free (sp);
-		break;
+		return NULL;
 		//r_socket_block_time (sp, R_FALSE, 0);
 	}
 	return sp;

diff --git a/libr/socket/socket.c b/libr/socket/socket.c
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2006-2012 pancake<nopcode.org> */
+/* radare - LGPL - Copyright 2006-2012 - pancake */
 
 #include <errno.h>
 #include <r_types.h>

diff --git a/libr/util/str.c b/libr/util/str.c
@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2007-2012 pancake<nopcode.org> */
+/* radare - LGPL - Copyright 2007-2012 - pancake */
 
 #include "r_types.h"
 #include "r_util.h"