diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-05-30 22:46:26 -0300 |
|---|---|---|
| committer | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-06-16 01:36:31 -0300 |
| commit | 8234f2839f78009442b4ed7bc0599e6b581d5cf8 (patch) | |
| tree | 58778fbe69bf5d471563a99163e3ade8aa661d32 /src/nvim/ex_getln.c | |
| parent | f7e64c3c5f70bf642f0ec7bec835f2827939abd7 (diff) | |
| download | rneovim-8234f2839f78009442b4ed7bc0599e6b581d5cf8.tar.gz rneovim-8234f2839f78009442b4ed7bc0599e6b581d5cf8.tar.bz2 rneovim-8234f2839f78009442b4ed7bc0599e6b581d5cf8.zip | |
No OOM in vim_strsave_escaped[_ext]()
Diffstat (limited to 'src/nvim/ex_getln.c')
| -rw-r--r-- | src/nvim/ex_getln.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index f2f00d3bd0..10702775d4 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -2947,17 +2947,13 @@ void ExpandEscape(expand_T *xp, char_u *str, int numfiles, char_u **files, int o /* for ":set path=" we need to escape spaces twice */ if (xp->xp_backslash == XP_BS_THREE) { p = vim_strsave_escaped(files[i], (char_u *)" "); - if (p != NULL) { - free(files[i]); - files[i] = p; + free(files[i]); + files[i] = p; #if defined(BACKSLASH_IN_FILENAME) - p = vim_strsave_escaped(files[i], (char_u *)" "); - if (p != NULL) { - free(files[i]); - files[i] = p; - } + p = vim_strsave_escaped(files[i], (char_u *)" "); + free(files[i]); + files[i] = p; #endif - } } #ifdef BACKSLASH_IN_FILENAME p = vim_strsave_fnameescape(files[i], FALSE); @@ -2987,10 +2983,8 @@ void ExpandEscape(expand_T *xp, char_u *str, int numfiles, char_u **files, int o */ for (i = 0; i < numfiles; ++i) { p = vim_strsave_escaped(files[i], (char_u *)"\\|\""); - if (p != NULL) { - free(files[i]); - files[i] = p; - } + free(files[i]); + files[i] = p; } } } @@ -3016,7 +3010,7 @@ char_u *vim_strsave_fnameescape(char_u *fname, int shell) p = vim_strsave_escaped(fname, buf); #else p = vim_strsave_escaped(fname, shell ? SHELL_ESC_CHARS : PATH_ESC_CHARS); - if (shell && csh_like_shell() && p != NULL) { + if (shell && csh_like_shell()) { char_u *s; /* For csh and similar shells need to put two backslashes before '!'. |