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 29c1645eb444dced7ce39ad0dc17f7c39695ec76..8e64773f6a2421e46ee98ffe25b271946a46bb87 100755 (executable)
--- 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 544ead830bc06e2c92c8660a077b2ea43f458802..ae6876fad1c568511d7b5e2721d3c4286590cb7e 100755 (executable)
--- 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;
 }