diff --git a/src/fileio.c b/src/fileio.c
index d27a1727ed..890eac7858 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5714,7 +5714,8 @@ file_pat_to_reg_pat(
 				)
 			    *allow_dirs = TRUE;
 			reg_pat[i++] = '\\';
-			reg_pat[i++] = *p;
+			if (enc_dbcs != 0 && (*mb_ptr2len)(p) > 1)
+			    reg_pat[i++] = *p++;
 		    }
 		break;
 #ifdef BACKSLASH_IN_FILENAME
diff --git a/src/testdir/crash/heap_overflow_glob2regpat b/src/testdir/crash/heap_overflow_glob2regpat
new file mode 100644
index 0000000000..8baf6f3253
Binary files /dev/null and b/src/testdir/crash/heap_overflow_glob2regpat differ
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index b3348761cf..e741a18b4d 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -222,6 +222,12 @@ func Test_crash1_3()
   call term_sendkeys(buf, args)
   call TermWait(buf, 150)
 
+  let file = 'crash/heap_overflow_glob2regpat'
+  let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  call term_sendkeys(buf, args)
+  call TermWait(buf, 50)
+
 
   " clean up
   exe buf .. "bw!"
diff --git a/src/version.c b/src/version.c
index 100a1ae700..59bd3fcdcc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    700,
 /**/
     699,
 /**/