From 8234f2839f78009442b4ed7bc0599e6b581d5cf8 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Fri, 30 May 2014 22:46:26 -0300 Subject: No OOM in vim_strsave_escaped[_ext]() --- src/nvim/ops.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/nvim/ops.c') diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 4f1cd5d526..d976b3d4e8 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -943,14 +943,12 @@ do_execreg ( (char_u *) "\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE); - if (p != NULL) { - /* When in Visual mode "'<,'>" will be prepended to the command. - * Remove it when it's already there. */ - if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) - retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); - else - retval = put_in_typebuf(p, TRUE, TRUE, silent); - } + /* When in Visual mode "'<,'>" will be prepended to the command. + * Remove it when it's already there. */ + if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0) + retval = put_in_typebuf(p + 5, TRUE, TRUE, silent); + else + retval = put_in_typebuf(p, TRUE, TRUE, silent); free(p); } else if (regname == '=') { p = get_expr_line(); -- cgit From 3a9a76c996b590f4a25fcf00afe8e89a85071bad Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Sat, 31 May 2014 00:10:32 -0300 Subject: No OOM in vim_strsave_escape_csi() --- src/nvim/ops.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/nvim/ops.c') diff --git a/src/nvim/ops.c b/src/nvim/ops.c index d976b3d4e8..e80ffac6e1 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -986,8 +986,6 @@ do_execreg ( return FAIL; } escaped = vim_strsave_escape_csi(y_current->y_array[i]); - if (escaped == NULL) - return FAIL; retval = ins_typebuf(escaped, remap, 0, TRUE, silent); free(escaped); if (retval == FAIL) -- cgit