diff --git a/src/edit.c b/src/edit.c
index f2ae425..70b8fee 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -4942,7 +4942,7 @@
     int		save_paste = p_paste;
 
     // If the end code is too long we can't detect it, read everything.
-    if (STRLEN(end) >= NUMBUFLEN)
+    if (end != NULL && STRLEN(end) >= NUMBUFLEN)
 	end = NULL;
     ++no_mapping;
     allow_keys = 0;
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index 60152f6..89ca6e1 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1451,6 +1451,7 @@
 endfunc
 
 func Test_search_special()
-  " this was causing illegal memory access
+  " this was causing illegal memory access and an endless loop
+  set t_PE=
   exe "norm /\x80PS"
 endfunc
diff --git a/src/version.c b/src/version.c
index de6f9f0..acffb43 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    135,
+/**/
     134,
 /**/
     133,