From b2ff915fe48d66a3d252b87f77e1635aa01cca51 Mon Sep 17 00:00:00 2001
From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Thu, 2 Apr 2026 16:30:05 +0000
Subject: [PATCH] patch 9.2.0282: tests: Test_viminfo_len_overflow() fails

Problem:  tests: Test_viminfo_len_overflow() fails
Solution: Catch E342 (Yasuhiro Matsumoto).

Test_viminfo_len_overflow tries to allocate ~4GB, which may throw E342
(out of memory) depending on the platform's memory allocation behavior.
This is an acceptable outcome since the test's purpose is to verify
that Vim does not crash on a crafted viminfo entry.

closes: #19891

Signed-off-by: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 src/testdir/test_viminfo.vim | 9 +++++++--
 src/version.c                | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

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,
 /**/