diff options
| author | Rubin Xu <rubinxu@google.com> | 2020-11-24 22:20:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-01-12 04:53:46 +0000 |
| commit | 8daf19b2c8cf7b9325b53e9b93b1eac878759f23 (patch) | |
| tree | 0f75c15b6d2f46b7cdc0ad37b1785fb732f684eb | |
| parent | e2247cfb11b05cfe5d9e5a69499dd3182f26e219 (diff) | |
| download | v8-8daf19b2c8cf7b9325b53e9b93b1eac878759f23.tar.gz | |
[parser] Fix off-by-one in parameter count check
Upstream: https://chromium-review.googlesource.com/c/1326029
Bug: 160610106
Test: atest proxy_resolver_v8_unittest
Change-Id: I547b1a0cb88094ed79bf6ffe034df7f8834be4d1
(cherry picked from commit 089e85f552ec92402d9fcd19d110b0c7521c4601)
| -rw-r--r-- | src/messages.h | 2 | ||||
| -rw-r--r-- | src/parsing/parser-base.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/messages.h b/src/messages.h index 030fc0b9..e94ce16e 100644 --- a/src/messages.h +++ b/src/messages.h @@ -695,7 +695,7 @@ class ErrorUtils : public AllStatic { T(TooManyArguments, \ "Too many arguments in function call (only 65535 allowed)") \ T(TooManyParameters, \ - "Too many parameters in function definition (only 65535 allowed)") \ + "Too many parameters in function definition (only 65534 allowed)") \ T(TooManySpreads, \ "Literal containing too many nested spreads (up to 65534 allowed)") \ T(TooManyVariables, "Too many variables declared (only 4194303 allowed)") \ diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h index 9d13724f..60d5e11f 100644 --- a/src/parsing/parser-base.h +++ b/src/parsing/parser-base.h @@ -3830,7 +3830,8 @@ void ParserBase<Impl>::ParseFormalParameterList(FormalParametersT* parameters, if (peek() != Token::RPAREN) { while (true) { - if (parameters->arity > Code::kMaxArguments) { + // Add one since we're going to be adding a parameter. + if (parameters->arity + 1 > Code::kMaxArguments) { ReportMessage(MessageTemplate::kTooManyParameters); *ok = false; return; |