From ab016d3dbd97bfba0493f1ee083fe4690cb21b81 Mon Sep 17 00:00:00 2001
From: Felipe Oliveira Carvalho <felipekde@gmail.com>
Date: Wed, 28 May 2014 23:10:01 -0300
Subject: No OOM in expand_shellcmd()

---
 src/nvim/ex_getln.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 96731f6a1a..78f466f497 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -3655,8 +3655,10 @@ ExpandFromContext (
     return FAIL;
   }
 
-  if (xp->xp_context == EXPAND_SHELLCMD)
-    return expand_shellcmd(pat, num_file, file, flags);
+  if (xp->xp_context == EXPAND_SHELLCMD) {
+    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_BUFFERS)
@@ -3836,9 +3838,8 @@ int ExpandGeneric(
 
 /*
  * Complete a shell command.
- * Returns FAIL or OK;
  */
-static int 
+static void
 expand_shellcmd (
     char_u *filepat,           /* pattern to match with command names */
     int *num_file,          /* return: number of matches */
@@ -3926,7 +3927,6 @@ expand_shellcmd (
   free(pat);
   if (mustfree)
     free(path);
-  return OK;
 }
 
 /*
-- 
cgit