aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c4
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5d23893be4..b56b9f8867 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3661,8 +3661,8 @@ void do_sub(exarg_T *eap)
// more efficient.
// TODO: find a generic solution to make line-joining operations more
// efficient, avoid allocating a string that grows in size.
- if (strcmp((const char *)pat, "\\n") == 0
- && strlen((const char *)pat) == 2
+ if (pat != NULL
+ && strcmp((const char *)pat, "\\n") == 0
&& *sub == NUL
&& (*cmd == NUL || (cmd[1] == NUL
&& (*cmd == 'g'
diff --git a/src/version.c b/src/version.c
index 7807ca8a41..d6076d665b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -215,7 +215,7 @@ static int included_patches[] = {
//248,
//247,
//246,
- //245,
+ 245,
//244,
//243,
//242,