diff --git a/src/testdir/test_viminfo.vim b/src/testdir/test_viminfo.vim
index b3a8b91cb1..de987ef278 100644
--- a/src/testdir/test_viminfo.vim
+++ b/src/testdir/test_viminfo.vim
@@ -1385,8 +1385,13 @@ func Test_viminfo_len_overflow()
         \ '|<CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC',
         \ '|<DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'], viminfo_file, 'b')
 
-  " Should not crash or cause memory errors
-  exe 'rviminfo! ' .. viminfo_file
+  " Should not crash or cause memory errors.
+  " E342 (out of memory) may be thrown depending on the platform's memory
+  " allocation behavior, which is an acceptable outcome.
+  try
+    exe 'rviminfo! ' .. viminfo_file
+  catch /E342/
+  endtry
 
   let &viminfofile = _viminfofile
 endfunc
diff --git a/src/version.c b/src/version.c
index d0b4692485..a05e5f39b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    282,
 /**/
     281,
 /**/