From: Mark Spencer Date: Sun, 9 Nov 2003 20:31:54 +0000 (+0000) Subject: Back out "leak" fixes, as it causes segfaults X-Git-Tag: 0.7.0~299 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d48b05d8ab16008c2e07c3f295f6ae1c77ab71bd;p=thirdparty%2Fasterisk.git Back out "leak" fixes, as it causes segfaults git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1713 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/asterisk.c b/asterisk.c index 29c1645eb4..8e64773f6a 100755 --- a/asterisk.c +++ b/asterisk.c @@ -949,7 +949,6 @@ static char *cli_complete(EditLine *el, int ch) if (matches) { int i; - int x; int matches_num, maxlen, match_len; if (matches[0][0] != '\0') { @@ -979,10 +978,6 @@ static char *cli_complete(EditLine *el, int ch) retval = CC_REFRESH; } } - for (x=0; matches[x]; x++) { - free(matches[x]); - matches[x] = NULL; - } free(matches); } diff --git a/cli.c b/cli.c index 544ead830b..ae6876fad1 100755 --- a/cli.c +++ b/cli.c @@ -864,14 +864,12 @@ int ast_cli_generatornummatches(char *text, char *word) 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; }