From 8e490b98ccad1aa701d88d5aba41bf7f8698be91 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Wed, 24 Jul 2019 19:55:32 -0400
Subject: [PATCH] regexp: use fixed types to avoid overflow

---
 src/nvim/regexp_nfa.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index abbb5a3867..a930fe5993 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -1493,13 +1493,13 @@ static int nfa_regatom(void)
 
     default:
     {
-      long n = 0;
-      int cmp = c;
+      int64_t n = 0;
+      const int cmp = c;
 
       if (c == '<' || c == '>')
         c = getchr();
       while (ascii_isdigit(c)) {
-        if (n > (INT_MAX - (c - '0')) / 10) {
+        if (n > (INT32_MAX - (c - '0')) / 10) {
           EMSG(_("E951: \\% value too large"));
           return FAIL;
         }
@@ -1507,7 +1507,7 @@ static int nfa_regatom(void)
         c = getchr();
       }
       if (c == 'l' || c == 'c' || c == 'v') {
-        int limit = INT_MAX;
+        int32_t limit = INT32_MAX;
 
         if (c == 'l') {
           // \%{n}l  \%{n}<l  \%{n}>l
@@ -1524,7 +1524,7 @@ static int nfa_regatom(void)
           // \%{n}v  \%{n}<v  \%{n}>v
           EMIT(cmp == '<' ? NFA_VCOL_LT :
                cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
-          limit = INT_MAX / MB_MAXBYTES;
+          limit = INT32_MAX / MB_MAXBYTES;
         }
         if (n >= limit) {
           EMSG(_("E951: \\% value too large"));