updated for version 7.4.245

Problem:    Crash for "vim -u NONE -N  -c '&&'".
Solution:   Check for the pattern to be NULL. (Dominique Pelle)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5321955cf5aee69f375df071b14706ea5cb54bbd..7ae4917a8bd333498316485b020860b8cc8f5d47 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4425,7 +4425,7 @@ do_sub(eap)
      * TODO: find a generic solution to make line-joining operations more
      * efficient, avoid allocating a string that grows in size.
      */
-    if (STRCMP(pat, "\\n") == 0 && STRLEN(pat) == 2
+    if (pat != NULL && STRCMP(pat, "\\n") == 0
            && *sub == NUL
            && (*cmd == NUL || (cmd[1] == NUL && (*cmd == 'g' || *cmd == 'l'
                                             || *cmd == 'p' || *cmd == '#'))))

diff --git a/src/version.c b/src/version.c
index da98b0ab99464b0a293480ca60c2a76da4a8709e..e38acfbd5b9ee6febeedc6e2621b2108c3f1c7fa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    245,
 /**/
     244,
 /**/