diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-26 15:20:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 15:20:59 +0200 |
| commit | eb663d53673c10fc5fe6af1cec354b1912780832 (patch) | |
| tree | 3a0912ecbd1cf453c481c311541bdc262b248ff9 /src/nvim/os/env.c | |
| parent | 8f058dca890ca9b9678e2435020f84a5f9c75acb (diff) | |
| parent | 16b55d2e9d074bb3de7505708c30c05fe02d8f12 (diff) | |
| download | rneovim-eb663d53673c10fc5fe6af1cec354b1912780832.tar.gz rneovim-eb663d53673c10fc5fe6af1cec354b1912780832.tar.bz2 rneovim-eb663d53673c10fc5fe6af1cec354b1912780832.zip | |
Merge #8903 from janlazo/vim-8.0.0883
Diffstat (limited to 'src/nvim/os/env.c')
| -rw-r--r-- | src/nvim/os/env.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index 6997156d4c..2f90d0bc9e 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -457,12 +457,15 @@ void expand_env_esc(char_u *restrict srcp, } else if ((src[0] == ' ' || src[0] == ',') && !one) { at_start = true; } - *dst++ = *src++; - --dstlen; + if (dstlen > 0) { + *dst++ = *src++; + dstlen--; - if (prefix != NULL && src - prefix_len >= srcp - && STRNCMP(src - prefix_len, prefix, prefix_len) == 0) { - at_start = true; + if (prefix != NULL + && src - prefix_len >= srcp + && STRNCMP(src - prefix_len, prefix, prefix_len) == 0) { + at_start = true; + } } } } |