aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Oliveira Carvalho <felipekde@gmail.com>2014-05-28 23:02:04 -0300
committerFelipe Oliveira Carvalho <felipekde@gmail.com>2014-06-16 01:31:35 -0300
commitbb978fa69ccab4b5b764ac025274145291cea3ca (patch)
tree8bd42beb6beab85014184818c38a179e3e3ead6f /src
parent129db629dd9e2911a191e23899d4c055df61fab5 (diff)
downloadrneovim-bb978fa69ccab4b5b764ac025274145291cea3ca.tar.gz
rneovim-bb978fa69ccab4b5b764ac025274145291cea3ca.tar.bz2
rneovim-bb978fa69ccab4b5b764ac025274145291cea3ca.zip
No OOM in save_cmdline_alloc()
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_getln.c6
-rw-r--r--src/nvim/getchar.c4
2 files changed, 2 insertions, 8 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 994b2f510f..96731f6a1a 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -2307,10 +2307,8 @@ char_u *save_cmdline_alloc(void)
*/
void restore_cmdline_alloc(char_u *p)
{
- if (p != NULL) {
- restore_cmdline((struct cmdline_info *)p);
- free(p);
- }
+ restore_cmdline((struct cmdline_info *)p);
+ free(p);
}
/*
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 57b0cf9a31..972ac9a0ec 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -3724,10 +3724,6 @@ eval_map_expr (
vim_unescape_csi(expr);
save_cmd = save_cmdline_alloc();
- if (save_cmd == NULL) {
- free(expr);
- return NULL;
- }
/* Forbid changing text or using ":normal" to avoid most of the bad side
* effects. Also restore the cursor position. */