From 9d7544ac4cd553c9b7c8b41926b7292c5ee85943 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 2 Dec 2023 10:17:43 +0800
Subject: [PATCH] vim-patch:9.0.2143: [security]: buffer-overflow in
 ex_substitute

Problem:  [security]: buffer-overflow in ex_substitute
Solution: clear memory after allocating

When allocating the new_start pointer in ex_substitute() the memory
pointer points to some garbage that the following for loop in
ex_cmds.c:4743 confuses and causes it to accessing the new_start pointer
beyond it's size, leading to a buffer-overlow.

So fix this by using alloc_clear() instead of alloc(), which will
clear the memory by NUL and therefore cause the loop to terminate
correctly.

Reported by @henices, thanks!

closes: vim/vim#13596

https://github.com/vim/vim/commit/abfa13ebe92d81aaf66669c428d767847b577453

Co-authored-by: Christian Brabandt <cb@256bit.org>
---
 src/nvim/ex_cmds.c                       |   5 ++++-
 test/old/testdir/crash/poc_ex_substitute | Bin 0 -> 135 bytes
 test/old/testdir/test_crash.vim          |  13 ++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 test/old/testdir/crash/poc_ex_substitute

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 2c51d64972..0711d82fe5 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -3144,7 +3144,7 @@ static char *sub_grow_buf(char **new_start, int *new_start_len, int needed_len)
     // substitution into (and some extra space to avoid
     // too many calls to xmalloc()/free()).
     *new_start_len = needed_len + 50;
-    *new_start = xmalloc((size_t)(*new_start_len));
+    *new_start = xcalloc(1, (size_t)(*new_start_len));
     **new_start = NUL;
     new_end = *new_start;
   } else {
@@ -3154,8 +3154,11 @@ static char *sub_grow_buf(char **new_start, int *new_start_len, int needed_len)
     size_t len = strlen(*new_start);
     needed_len += (int)len;
     if (needed_len > *new_start_len) {
+      size_t prev_new_start_len = (size_t)(*new_start_len);
       *new_start_len = needed_len + 50;
+      size_t added_len = (size_t)(*new_start_len) - prev_new_start_len;
       *new_start = xrealloc(*new_start, (size_t)(*new_start_len));
+      memset(*new_start + prev_new_start_len, 0, added_len);
     }
     new_end = *new_start + len;
   }
diff --git a/test/old/testdir/crash/poc_ex_substitute b/test/old/testdir/crash/poc_ex_substitute
new file mode 100644
index 0000000000000000000000000000000000000000..bcf1286512f21a787dcd048ac1eb7f3611db47e3
GIT binary patch
literal 135
zcmXR;RY=WC&QHnAOSer)O)5=SuvAFp$|=!T;NmL&|DQpvm`h(%KSqJ8nE5}Ky=_rR
zP>y|BrUI7%SBW1?NoFor{)89|;iAP{>OiUN)YO6kg?tUof@B4*vSKcS;^d<L83GI`
Lsa#O1IG+mubIvNu

literal 0
HcmV?d00001

diff --git a/test/old/testdir/test_crash.vim b/test/old/testdir/test_crash.vim
index 1d4f435e4d..49e712a901 100644
--- a/test/old/testdir/test_crash.vim
+++ b/test/old/testdir/test_crash.vim
@@ -117,7 +117,7 @@ func Test_crash1_2()
   " The following used to crash Vim
   let opts = #{cmd: 'sh'}
   let vim  = GetVimProg()
-  let result = 'X_crash1_1_result.txt'
+  let result = 'X_crash1_2_result.txt'
 
   let buf = RunVimInTerminal('sh', opts)
 
@@ -149,6 +149,17 @@ func Test_crash1_2()
     \ ' ; echo "crash 4: [OK]" >> '.. result .. "\<cr>")
   call TermWait(buf, 150)
 
+  let file = 'crash/poc_ex_substitute'
+  let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
+  let args = printf(cmn_args, vim, file)
+  " just make sure it runs, we don't care about the resulting echo
+  call term_sendkeys(buf, args .. "\<cr>")
+  " There is no output generated in Github CI for the asan clang build.
+  " so just skip generating the ouput.
+  " call term_sendkeys(buf, args ..
+  "   \ ' &&  echo "crash 5: [OK]" >> '.. result .. "\<cr>")
+  call TermWait(buf, 150)
+
   " clean up
   exe buf .. "bw!"