diff --git a/src/fileio.c b/src/fileio.c
index d27a172..890eac7 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5714,7 +5714,8 @@
 				)
 			    *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 0000000..8baf6f3
--- /dev/null
+++ b/src/testdir/crash/heap_overflow_glob2regpat
Binary files differ
diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index b334876..e741a18 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -222,6 +222,12 @@
   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 100a1ae..59bd3fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    700,
+/**/
     699,
 /**/
     698,