From 0fb375aae608d7306b4baf9c1f906961f32e2abf Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Wed, 29 Nov 2023 10:23:39 +0100
Subject: [PATCH] patch 9.0.2141: [security]: buffer-overflow in
 suggest_trie_walk

Problem:  [security]: buffer-overflow in suggest_trie_walk
Solution: Check n before using it as index into byts array

Basically, n as an index into the byts array, can point to beyond the byts
array. So let's double check, that n is within the expected range after
incrementing it from sp->ts_curi and bail out if it would be invalid.

Reported by @henices, thanks!

Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 src/spellsuggest.c                      |   7 +++++++
 src/testdir/crash/poc_suggest_trie_walk | Bin 0 -> 100 bytes
 src/testdir/test_crash.vim              |   8 ++++++++
 src/version.c                           |   2 ++
 4 files changed, 17 insertions(+)
 create mode 100644 src/testdir/crash/poc_suggest_trie_walk

diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index e1c303a0ab..ecc0a7403d 100644
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -2175,6 +2175,13 @@ suggest_trie_walk(
 	    // - Skip the byte if it's equal to the byte in the word,
 	    //   accepting that byte is always better.
 	    n += sp->ts_curi++;
+
+	    // break out, if we would be accessing byts buffer out of bounds
+	    if (byts == slang->sl_fbyts && n >= slang->sl_fbyts_len)
+	    {
+		got_int = TRUE;
+		break;
+	    }
 	    c = byts[n];
 	    if (soundfold && sp->ts_twordlen == 0 && c == '*')
 		// Inserting a vowel at the start of a word counts less,
diff --git a/src/testdir/crash/poc_suggest_trie_walk b/src/testdir/crash/poc_suggest_trie_walk
new file mode 100644
index 0000000000000000000000000000000000000000..c79b6eeb5c340057d353903142910f4df292581a
GIT binary patch
literal 100
zcmXR;RY=WC&QHnAOSer)O)5=i;L6K4P%ua|s0!CL++e^}oSCDTmtT}CR#0MTAn}5k
Y0U=^wT4agDlK`;|Kx$QxM5}BW0AW)fkN^Mx

literal 0
HcmV?d00001

diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index 11c5f4e014..eef1731454 100644
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -135,6 +135,13 @@ func Test_crash1_2()
     \ '  && echo "crash 2: [OK]" >> '.. result .. "\<cr>")
   call TermWait(buf, 350)
 
+  let file = 'crash/poc_suggest_trie_walk'
+  let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  call term_sendkeys(buf, args ..
+    \ '  && echo "crash 3: [OK]" >> '.. result .. "\<cr>")
+  call TermWait(buf, 150)
+
   " clean up
   exe buf .. "bw!"
 
@@ -143,6 +150,7 @@ func Test_crash1_2()
   let expected = [
       \ 'crash 1: [OK]',
       \ 'crash 2: [OK]',
+      \ 'crash 3: [OK]',
       \ ]
 
   call assert_equal(expected, getline(1, '$'))
diff --git a/src/version.c b/src/version.c
index e32e5c006d..ecb5c22304 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 */
+/**/
+    2141,
 /**/
     2140,
 /**/