patch 9.0.0947: invalid memory access in substitute with function
Problem: Invalid memory access in substitute with function that goes to
another file.
Solution: Check for text locked in CTRL-W gf.
diff --git a/src/normal.c b/src/normal.c
index 938ae71..0d1eba7 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -188,7 +188,8 @@
{
if (text_locked())
{
- clearopbeep(oap);
+ if (oap != NULL)
+ clearopbeep(oap);
text_locked_msg();
return TRUE;
}
@@ -196,6 +197,25 @@
}
/*
+ * If text is locked, "curbuf_lock" or "allbuf_lock" is set:
+ * Give an error message, possibly beep and return TRUE.
+ * "oap" may be NULL.
+ */
+ int
+check_text_or_curbuf_locked(oparg_T *oap)
+{
+ if (check_text_locked(oap))
+ return TRUE;
+ if (curbuf_locked())
+ {
+ if (oap != NULL)
+ clearop(oap);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/*
* Handle the count before a normal command and set cap->count0.
*/
static int
@@ -798,8 +818,7 @@
goto normal_end;
}
- if ((nv_cmds[idx].cmd_flags & NV_NCW)
- && (check_text_locked(oap) || curbuf_locked()))
+ if ((nv_cmds[idx].cmd_flags & NV_NCW) && check_text_or_curbuf_locked(oap))
// this command is not allowed now
goto normal_end;
@@ -4026,13 +4045,9 @@
char_u *ptr;
linenr_T lnum = -1;
- if (check_text_locked(cap->oap))
+ if (check_text_or_curbuf_locked(cap->oap))
return;
- if (curbuf_locked())
- {
- clearop(cap->oap);
- return;
- }
+
#ifdef FEAT_PROP_POPUP
if (ERROR_IF_TERM_POPUP_WINDOW)
return;