From e362c3d2c34f2b7ff38b4c3d2a7ff127d2290e09 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 22 Jan 2017 15:40:00 +0100 Subject: [PATCH] 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. --- src/tag.c | 3 ++- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tag.c b/src/tag.c index a80a362df..61d40e502 100644 --- 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 918bee46a..0e13125c7 100644 --- 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, /**/ -- 2.50.1