patch 8.0.1622: possible NULL pointer dereference

Problem:    Possible NULL pointer dereferencey. (Coverity)
Solution:   Reverse the check for a NULL pointer.

diff --git a/src/quickfix.c b/src/quickfix.c
index e8fe59b331c419e0c7855bd5b5651eef6c3e8d45..6e1e859a2fc7f3ee68a01992e0261d9a08875489 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -4256,7 +4256,7 @@ ex_vimgrep(exarg_T *eap)
        goto theend;
     }
 
-    if (s != NULL && *s == NUL)
+    if (s == NULL || *s == NUL)
     {
        /* Pattern is empty, use last search pattern. */
        if (last_search_pat() == NULL)

diff --git a/src/version.c b/src/version.c
index 339ac9074f549ea81eb1d9c8db2faf6a8d4d75cf..418ca0c9e4de7d35470ffe56a4de014659f8542d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1622,
 /**/
     1621,
 /**/