[Asterisk-cvs] asterisk asterisk.c,1.26,1.27 cli.c,1.13,1.14

markster at lists.digium.com markster at lists.digium.com
Sun Nov 9 14:05:42 CST 2003


Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv21852

Modified Files:
	asterisk.c cli.c 
Log Message:
Back out "leak" fixes, as it causes segfaults


Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- asterisk.c	9 Nov 2003 19:33:39 -0000	1.26
+++ asterisk.c	9 Nov 2003 20:31:54 -0000	1.27
@@ -949,7 +949,6 @@
 
 	if (matches) {
 		int i;
-		int x;
 		int matches_num, maxlen, match_len;
 
 		if (matches[0][0] != '\0') {
@@ -979,10 +978,6 @@
 				retval = CC_REFRESH;
 			}
 		}
-	for (x=0; matches[x]; x++) {
-		free(matches[x]);
-		matches[x] = NULL;
-	}
 	free(matches);
 	}
 

Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cli.c	9 Nov 2003 19:33:39 -0000	1.13
+++ cli.c	9 Nov 2003 20:31:54 -0000	1.14
@@ -864,14 +864,12 @@
 
 	while ( (buf = ast_cli_generator(text, word, i)) ) {
 		if (++i > 1 && strcmp(buf,oldbuf) == 0)  {
-				free(buf);
 				continue;
 		}
 		oldbuf = buf;
 		matches++;
 	}
-	free(oldbuf);
-	free(buf);
+
 	return matches;
 }
 




More information about the svn-commits mailing list