diff options
author | Mike Pall <mike> | 2019-12-08 19:50:36 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2019-12-08 19:50:36 +0100 |
commit | 1d9a337de6630746e3e8580aa855c0376c67d356 (patch) | |
tree | 17789d6e157442c8ec6c400a97bccc057d43be31 /src/lj_lex.c | |
parent | 05898a8824f119d586e5fb079f1e66d8cac38160 (diff) | |
parent | de48d000941f58a8d4d816e9d227de8a4f3c9de6 (diff) | |
download | luajit-1d9a337de6630746e3e8580aa855c0376c67d356.tar.gz luajit-1d9a337de6630746e3e8580aa855c0376c67d356.tar.bz2 luajit-1d9a337de6630746e3e8580aa855c0376c67d356.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_lex.c')
-rw-r--r-- | src/lj_lex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_lex.c b/src/lj_lex.c index 2d2f8194..fb3d95ee 100644 --- a/src/lj_lex.c +++ b/src/lj_lex.c | |||
@@ -138,7 +138,7 @@ static int lex_skipeq(LexState *ls) | |||
138 | int count = 0; | 138 | int count = 0; |
139 | LexChar s = ls->c; | 139 | LexChar s = ls->c; |
140 | lua_assert(s == '[' || s == ']'); | 140 | lua_assert(s == '[' || s == ']'); |
141 | while (lex_savenext(ls) == '=') | 141 | while (lex_savenext(ls) == '=' && count < 0x20000000) |
142 | count++; | 142 | count++; |
143 | return (ls->c == s) ? count : (-count) - 1; | 143 | return (ls->c == s) ? count : (-count) - 1; |
144 | } | 144 | } |