patch 7.4.1406

Problem:    Leaking memory in cs_print_tags_priv().
Solution:   Free tbuf. (idea by Forrest Fleming)

diff --git a/src/if_cscope.c b/src/if_cscope.c
index c135fe5bbcf8d913a5c9d425a643375a8e4ae50e..b5ca6148b9599622ad30824be8527f245a528022 100644 (file)
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -2092,12 +2092,13 @@ cs_print_tags_priv(char **matches, char **cntxts, int num_matches)
            continue;
        (void)strcpy(tbuf, matches[idx]);
 
-       if (strtok(tbuf, (const char *)"\t") == NULL)
-           continue;
-       if ((fname = strtok(NULL, (const char *)"\t")) == NULL)
-           continue;
-       if ((lno = strtok(NULL, (const char *)"\t")) == NULL)
+       if (strtok(tbuf, (const char *)"\t") == NULL
+               || (fname = strtok(NULL, (const char *)"\t")) == NULL
+               || (lno = strtok(NULL, (const char *)"\t")) == NULL)
+       {
+           vim_free(tbuf);
            continue;
+       }
        extra = strtok(NULL, (const char *)"\t");
 
        lno[strlen(lno)-2] = '\0';  /* ignore ;" at the end */

diff --git a/src/version.c b/src/version.c
index 5696dfc4b837c4634fd257246603d1c2dc371c4f..a04a948c668947aa3066f34a5f95094ff804a6bc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1406,
 /**/
     1405,
 /**/