summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-01-30 22:52:06 +0100
committerBram Moolenaar <Bram@vim.org>2018-01-30 22:52:06 +0100
commita172b63ab8661019dba61285a738c8b6b55a33aa (patch)
tree88c353405f95e8bdcf4ebf0e8f9afdf6a0162185
parentce46d934af35d0f774be7f996001db03cf0b894a (diff)
patch 8.0.1442: using pointer before it is setv8.0.1442
Problem: Using pointer before it is set. Solution: Search in whole buffer instead of next token.
-rw-r--r--src/if_cscope.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 9466c34f9d..4bf28ad1d1 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -702,7 +702,7 @@ cs_cnt_matches(int idx)
* Accept "\S*cscope: X lines", also matches "mlcscope".
* Bail out for the "Unable to search" error.
*/
- if (strstr((const char *)stok, "Unable to search database") != NULL)
+ if (strstr((const char *)buf, "Unable to search database") != NULL)
break;
if ((stok = strtok(buf, (const char *)" ")) == NULL)
continue;
diff --git a/src/version.c b/src/version.c
index 1cee1481fc..43e89a2847 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1442,
+/**/
1441,
/**/
1440,