commit e4e4ca007b16acdf73102b2fa1a3a195add698ae
author Rubin Xu <rubinxu@google.com> Thu Jan 07 12:46:29 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 07 12:46:29 2021 +0000
tree f44b850fee8d1b2f44b02c6351fb971fae1fbfad
parent 0809cf96aa0a547150173bd0cb06452dce878d61
parent e3963822c3fe08ab261d7b122a953a340a328a0b

[parser] Fix off-by-one in parameter count check am: 089e85f552 am: e3963822c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13120352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa99d17825888a33a07adffc6fd5109712a81ac

src/messages.h

diff --git a/src/messages.h b/src/messages.h
index 030fc0b..e94ce16 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -695,7 +695,7 @@
   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)")    \

src/parsing/parser-base.h

diff --git a/src/parsing/parser-base.h b/src/parsing/parser-base.h
index 9d13724..60d5e11 100644
--- a/src/parsing/parser-base.h
+++ b/src/parsing/parser-base.h
@@ -3830,7 +3830,8 @@
 
   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;