aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.0817: not enough memory allocated when converting string

Browse Source 
Problem:    Not enough memory allocated when converting string with special
            character.
Solution:   Reserve space for modifier code. (closes #6130)
This commit is contained in:
Bram Moolenaar
2020-05-24 18:45:07 +02:00
parent 87202264f8
commit f7271e8316
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/eval.c
View File

@@ -3503,6 +3503,7 @@ get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
char_u *p;
char_u *name;
int extra = 0;
int len;
/*
* Find the end of the string, skipping backslashed characters.
@@ -3513,9 +3514,10 @@ get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
{
++p;
// A "\<x>" form occupies at least 4 characters, and produces up
// to 6 characters: reserve space for 2 extra
// to 9 characters (6 for the char and 3 for a modifier): reserve
// space for 5 extra.
if (*p == '<')
extra += 2;
extra += 5;
}
}
@@ -3536,7 +3538,8 @@ get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
* Copy the string into allocated memory, handling backslashed
* characters.
*/
name = alloc(p - *arg + extra);
len = (int)(p - *arg + extra);
name = alloc(len);
if (name == NULL)
return FAIL;
rettv->v_type = VAR_STRING;
@@ -3610,6 +3613,8 @@ get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
if (extra != 0)
{
name += extra;
if (name >= rettv->vval.v_string + len)
iemsg("get_string_tv() used more space than allocated");
break;
}
// FALLTHROUGH