aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_getln.c
diff options
context:
space:
mode:
authorFelipe Oliveira Carvalho <felipekde@gmail.com>2014-05-31 00:48:14 -0300
committerFelipe Oliveira Carvalho <felipekde@gmail.com>2014-06-16 01:40:28 -0300
commitf4002c97dc36e817a59b5e18c852d1a17e775c1c (patch)
tree686c2690fe42eab952750bfbf26c32a85a7c07fb /src/nvim/ex_getln.c
parentb1595e74f2811b8fb5f04aa14ef80dbe3b69ae73 (diff)
downloadrneovim-f4002c97dc36e817a59b5e18c852d1a17e775c1c.tar.gz
rneovim-f4002c97dc36e817a59b5e18c852d1a17e775c1c.tar.bz2
rneovim-f4002c97dc36e817a59b5e18c852d1a17e775c1c.zip
No OOM in ExpandOldSetting()
Diffstat (limited to 'src/nvim/ex_getln.c')
-rw-r--r--src/nvim/ex_getln.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 959dfd1584..02c82eaf21 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -3651,8 +3651,10 @@ ExpandFromContext (
expand_shellcmd(pat, num_file, file, flags);
return OK;
}
- if (xp->xp_context == EXPAND_OLD_SETTING)
- return ExpandOldSetting(num_file, file);
+ if (xp->xp_context == EXPAND_OLD_SETTING) {
+ ExpandOldSetting(num_file, file);
+ return OK;
+ }
if (xp->xp_context == EXPAND_BUFFERS)
return ExpandBufnames(pat, num_file, file, options);
if (xp->xp_context == EXPAND_TAGS