diff options
| author | ZyX <kp-pav@yandex.ru> | 2018-04-15 19:33:50 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2018-04-15 20:07:07 +0300 |
| commit | d7e4449adbd483512580a2a9e823190b61f2aa53 (patch) | |
| tree | e2129bb17e38515ccb4b3991eb2d17e5e0e3fe28 | |
| parent | 103be37f423ee2ec143c88b94c3a2a33d98b8a68 (diff) | |
| download | rneovim-d7e4449adbd483512580a2a9e823190b61f2aa53.tar.gz rneovim-d7e4449adbd483512580a2a9e823190b61f2aa53.tar.bz2 rneovim-d7e4449adbd483512580a2a9e823190b61f2aa53.zip | |
ex_docmd: Fix PVS/V547: due to short-circuiting name_len is never > 4
| -rw-r--r-- | src/nvim/ex_docmd.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 4b37abab9e..f39c996902 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -5181,11 +5181,13 @@ static void ex_command(exarg_T *eap) p = skipwhite(end); } - /* Get the name (if any) and skip to the following argument */ + // Get the name (if any) and skip to the following argument. name = p; - if (ASCII_ISALPHA(*p)) - while (ASCII_ISALNUM(*p)) - ++p; + if (ASCII_ISALPHA(*p)) { + while (ASCII_ISALNUM(*p)) { + p++; + } + } if (!ends_excmd(*p) && !ascii_iswhite(*p)) { EMSG(_("E182: Invalid command name")); return; @@ -5203,8 +5205,7 @@ static void ex_command(exarg_T *eap) EMSG(_("E183: User defined commands must start with an uppercase letter")); return; } else if ((name_len == 1 && *name == 'X') - || (name_len <= 4 - && STRNCMP(name, "Next", name_len > 4 ? 4 : name_len) == 0)) { + || (name_len <= 4 && STRNCMP(name, "Next", name_len) == 0)) { EMSG(_("E841: Reserved name, cannot be used for user defined command")); return; } else |