aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/strings.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2018-08-09 00:51:40 -0400
committerJan Edmund Lazo <janedmundlazo@hotmail.com>2018-08-09 00:55:20 -0400
commit4420dc3067a776271a94080a4b1b42a1e74bb2dc (patch)
treed826e0940f3888930b30da1edfc0e8484581713f /src/nvim/strings.c
parenta44588798564dae1dc28b31af49e38399888d9a2 (diff)
downloadrneovim-4420dc3067a776271a94080a4b1b42a1e74bb2dc.tar.gz
rneovim-4420dc3067a776271a94080a4b1b42a1e74bb2dc.tar.bz2
rneovim-4420dc3067a776271a94080a4b1b42a1e74bb2dc.zip
vim-patch:8.0.1421: accessing invalid memory with overlong byte sequence
Problem: Accessing invalid memory with overlong byte sequence. Solution: Check for NUL character. (test by Dominique Pelle, closes vim/vim#2485) https://github.com/vim/vim/commit/e6640ad44e2186bd3642b972115496d347cd1fdd
Diffstat (limited to 'src/nvim/strings.c')
-rw-r--r--src/nvim/strings.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 3f31914c03..d812aba048 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -344,14 +344,17 @@ char *strcase_save(const char *const orig, bool upper)
char *p = res;
while (*p != NUL) {
- int l;
-
int c = utf_ptr2char((const char_u *)p);
+ int l = utf_ptr2len((const char_u *)p);
+ if (c == 0) {
+ // overlong sequence, use only the first byte
+ c = *p;
+ l = 1;
+ }
int uc = upper ? mb_toupper(c) : mb_tolower(c);
// Reallocate string when byte count changes. This is rare,
// thus it's OK to do another malloc()/free().
- l = utf_ptr2len((const char_u *)p);
int newl = utf_char2len(uc);
if (newl != l) {
// TODO(philix): use xrealloc() in strup_save()