aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2018-06-04 11:13:05 -0400
committerJan Edmund Lazo <janedmundlazo@hotmail.com>2018-06-04 17:51:15 -0400
commit2ab7165214e82fb6f509663929243b13d0ef163a (patch)
tree9cd7f287473d949176a9991d91326c0cf55c5b74
parent21aa4bc428e439e7132474aee646552c9b0d6b63 (diff)
downloadrneovim-2ab7165214e82fb6f509663929243b13d0ef163a.tar.gz
rneovim-2ab7165214e82fb6f509663929243b13d0ef163a.tar.bz2
rneovim-2ab7165214e82fb6f509663929243b13d0ef163a.zip
lint
-rw-r--r--src/nvim/regexp.c11
-rw-r--r--src/nvim/regexp_nfa.c3
2 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 94c324c0e7..c4af7d9e4a 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2234,15 +2234,18 @@ collection:
if (endc == '\\' && !reg_cpo_lit)
endc = coll_get_char();
- if (startc > endc)
+ if (startc > endc) {
EMSG_RET_NULL(_(e_reverse_range));
+ }
if (has_mbyte && ((*mb_char2len)(startc) > 1
|| (*mb_char2len)(endc) > 1)) {
- /* Limit to a range of 256 chars */
- if (endc > startc + 256)
+ // Limit to a range of 256 chars
+ if (endc > startc + 256) {
EMSG_RET_NULL(_(e_large_class));
- while (++startc <= endc)
+ }
+ while (++startc <= endc) {
regmbc(startc);
+ }
} else {
while (++startc <= endc)
regc(startc);
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 3e4a32b178..334539b228 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -1711,8 +1711,9 @@ collection:
if (emit_range) {
endc = startc;
startc = oldstartc;
- if (startc > endc)
+ if (startc > endc) {
EMSG_RET_FAIL(_(e_reverse_range));
+ }
if (endc > startc + 2) {
/* Emit a range instead of the sequence of