diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-04-26 23:30:34 -0700 |
|---|---|---|
| committer | Michael Ennen <mike.ennen@gmail.com> | 2016-04-26 23:33:22 -0700 |
| commit | 7209d3c59a4d7e26c96371d66144872e595098c6 (patch) | |
| tree | 0a337a2f82e4af87a5d6a7e8b13aa5c04cc9a4ea | |
| parent | 2adb8acebd1b50d6259834082d5a21788c0e3eeb (diff) | |
| download | rneovim-7209d3c59a4d7e26c96371d66144872e595098c6.tar.gz rneovim-7209d3c59a4d7e26c96371d66144872e595098c6.tar.bz2 rneovim-7209d3c59a4d7e26c96371d66144872e595098c6.zip | |
vim-patch: 7.4.1075
Problem: Crash when using an invalid command.
Solution: Fix generating the error message. (Dominique Pelle)
https://github.com/vim/vim/commit/05fe017c1ac0503b706dad695097572fde01ab0b
| -rw-r--r-- | src/nvim/ex_docmd.c | 7 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 648a3a8487..3d84d7116b 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -5503,7 +5503,8 @@ int parse_addr_type_arg(char_u *value, int vallen, uint32_t *argt, int *addr_type_arg) { int i, a, b; - for (i = 0; addr_type_complete[i].expand != -1; ++i) { + + for (i = 0; addr_type_complete[i].expand != -1; i++) { a = (int)STRLEN(addr_type_complete[i].name) == vallen; b = STRNCMP(value, addr_type_complete[i].name, vallen) == 0; if (a && b) { @@ -5514,8 +5515,8 @@ int parse_addr_type_arg(char_u *value, int vallen, uint32_t *argt, if (addr_type_complete[i].expand == -1) { char_u *err = value; - for (i = 0; err[i] == NUL || !ascii_iswhite(err[i]); i++) - ; + + for (i = 0; err[i] != NUL && !ascii_iswhite(err[i]); i++) {} err[i] = NUL; EMSG2(_("E180: Invalid address type value: %s"), err); return FAIL; diff --git a/src/nvim/version.c b/src/nvim/version.c index 4e379339be..aeb07077e6 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -602,8 +602,8 @@ static int included_patches[] = { // 1078 NA // 1077 NA 1076, - // 1075, - // 1074 NA + 1075, + // 1074 NA, // 1073, 1072, // 1071, |