diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 14 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 5968edb074..bfe39ced0c 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -14460,7 +14460,7 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv, } 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. 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; i += len; - char_u *s = vim_strnsave(start, len); - for (size_t j = 0; j < len; j++) { - if (s[j] == NUL) { - s[j] = NL; - } - } + // Don't use a str function to copy res as it may contains NULs. + char_u *s = xmemdupz(start, len); + memchrsub(s, NUL, NL, len); // Replace NUL with NL to avoid truncation. listitem_T *li = listitem_alloc(); 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); - - rettv->v_type = VAR_LIST; - rettv->vval.v_list = list; } else { #ifdef USE_CRNL // translate <CR><NL> into <NL> diff --git a/src/nvim/version.c b/src/nvim/version.c index a453c0ee10..47f4a2f805 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -385,7 +385,7 @@ static int included_patches[] = { //259 NA //258 NA //257 NA - //256, + 256, //255, //254, 253, |