aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-12-02 10:17:43 +0800
committerzeertzjq <zeertzjq@outlook.com>2023-12-02 10:41:31 +0800
commit9d7544ac4cd553c9b7c8b41926b7292c5ee85943 (patch)
tree492b01ed1fed314cf279bb84857db1527be91d19 /src
parent9cc346119bee505e0be3827b35c573701a307001 (diff)
downloadrneovim-9d7544ac4cd553c9b7c8b41926b7292c5ee85943.tar.gz
rneovim-9d7544ac4cd553c9b7c8b41926b7292c5ee85943.tar.bz2
rneovim-9d7544ac4cd553c9b7c8b41926b7292c5ee85943.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_cmds.c5
1 files changed, 4 insertions, 1 deletions
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;
}