From: Bram Moolenaar Date: Sun, 10 Jan 2016 12:54:48 +0000 (+0100) Subject: patch 7.4.1075 X-Git-Tag: v7.4.1075 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05fe017c1ac0503b706dad695097572fde01ab0b;p=vim patch 7.4.1075 Problem: Crash when using an invalid command. Solution: Fix generating the error message. (Dominique Pelle) --- diff --git a/src/ex_docmd.c b/src/ex_docmd.c index ac713dc13..837d13521 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -6916,6 +6916,7 @@ parse_addr_type_arg(value, vallen, argt, addr_type_arg) int *addr_type_arg; { int i, a, b; + for (i = 0; addr_type_complete[i].expand != -1; ++i) { a = (int)STRLEN(addr_type_complete[i].name) == vallen; @@ -6930,7 +6931,9 @@ parse_addr_type_arg(value, vallen, argt, addr_type_arg) if (addr_type_complete[i].expand == -1) { char_u *err = value; - for (i=0; err[i] == NUL || !vim_iswhite(err[i]); i++); + + for (i = 0; err[i] != NUL && !vim_iswhite(err[i]); i++) + ; err[i] = NUL; EMSG2(_("E180: Invalid address type value: %s"), err); return FAIL; diff --git a/src/version.c b/src/version.c index d1b5124a9..0eaa1b11e 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1075, /**/ 1074, /**/