IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.256

Browse Source 
Problem:    Using systemlist() may cause a crash and does not handle NUL
            characters properly.
Solution:   Increase the reference count, allocate memory by length. (Yasuhiro
            Matsumoto)

https://code.google.com/p/vim/source/detail?r=v7-4-256
This commit is contained in:
Scott Prager 2014-09-05 16:41:07 -04:00
parent 78979427d1
commit b0bda2ee87
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/eval.c
View File

@ -14460,7 +14460,7 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv,
} }
if (retlist) { if (retlist) {
list_T *list = list_alloc(); list_T *list = rettv_list_alloc(rettv);
// Copy each line to a list element using NL as the delimiter. // Copy each line to a list element using NL as the delimiter.
for (size_t i = 0; i < nread; i++) { for (size_t i = 0; i < nread; i++) {
@ -14468,12 +14468,9 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv,
size_t len = (char_u *) xmemscan(start, NL, nread - i) - start; size_t len = (char_u *) xmemscan(start, NL, nread - i) - start;
i += len; i += len;
char_u *s = vim_strnsave(start, len); // Don't use a str function to copy res as it may contains NULs.
for (size_t j = 0; j < len; j++) { char_u *s = xmemdupz(start, len);
if (s[j] == NUL) { memchrsub(s, NUL, NL, len); // Replace NUL with NL to avoid truncation.
s[j] = NL;
}
}
listitem_T *li = listitem_alloc(); listitem_T *li = listitem_alloc();
li->li_tv.v_type = VAR_STRING; li->li_tv.v_type = VAR_STRING;
@ -14482,9 +14479,6 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv,
} }
free(res); free(res);
rettv->v_type = VAR_LIST;
rettv->vval.v_list = list;
} else { } else {
#ifdef USE_CRNL #ifdef USE_CRNL
// translate <CR><NL> into <NL> // translate <CR><NL> into <NL>

2
src/nvim/version.c
View File

@ -385,7 +385,7 @@ static int included_patches[] = {
//259 NA //259 NA
//258 NA //258 NA
//257 NA //257 NA
//256, 256,
//255, //255,
//254, //254,
253, 253,