patch 8.0.0215: NULL pointer use if cscope line looks like emacs tag

Problem:    When a Cscope line contains CTRL-L a NULL pointer may be used.
            (Coverity)
Solution:   Don't check for an emacs tag in a cscope line.

diff --git a/src/tag.c b/src/tag.c
index a80a362df32f6e201e238fb4510678fe9e7acaa8..61d40e50287788d4ab908b6ee2d7938dc46a2a85 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -1752,8 +1752,9 @@ line_read_in:
            /*
             * Emacs tags line with CTRL-L: New file name on next line.
             * The file name is followed by a ','.
+            * Remember etag file name in ebuf.
             */
-           if (*lbuf == Ctrl_L)        /* remember etag file name in ebuf */
+           if (*lbuf == Ctrl_L && !use_cscope)
            {
                is_etag = 1;            /* in case at the start */
                state = TS_LINEAR;

diff --git a/src/version.c b/src/version.c
index 918bee46add85a0fba90652fef849cd0f5580607..0e13125c790e3ebf4fe04e714b4cb2555340f8c3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    215,
 /**/
     214,
 /**/