diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-01-22 15:40:00 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-01-22 15:40:00 +0100 |
commit | e362c3d2c34f2b7ff38b4c3d2a7ff127d2290e09 (patch) | |
tree | 1350a219aeb3dd0a765d76d585b2a1d87d6ed0f2 | |
parent | d7a96151e0c86e8d4f9162c919cf3ff400a893b6 (diff) | |
download | vim-git-e362c3d2c34f2b7ff38b4c3d2a7ff127d2290e09.tar.gz |
patch 8.0.0215: NULL pointer use if cscope line looks like emacs tagv8.0.0215
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.
-rw-r--r-- | src/tag.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 215, +/**/ 214, /**/ 213, |