From: Ken Jin <kenjin@python.org>
Date: Wed, 25 Sep 2024 18:41:07 +0000 (+0800)
Subject: gh-117376: Fix off-by-ones in conversion functions (GH-124301)
X-Git-Tag: v3.14.0a1~345
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=198756b0f653e9f487076df2c6f943e374def6cb;p=thirdparty%2FPython%2Fcpython.git

gh-117376: Fix off-by-ones in conversion functions (GH-124301)

Fix off-by-ones in conversion function
---

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index bf8f6af83fc5..0fd396f1319e 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -3928,7 +3928,7 @@ dummy_func(
             PyCFunctionFastWithKeywords cfunc =
                 (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
 
-            STACKREFS_TO_PYOBJECTS(args, nargs, args_o);
+            STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
             if (CONVERSION_FAILED(args_o)) {
                 DECREF_INPUTS();
                 ERROR_IF(true, error);
@@ -4009,7 +4009,7 @@ dummy_func(
                 (PyCFunctionFast)(void(*)(void))meth->ml_meth;
             int nargs = total_args - 1;
 
-            STACKREFS_TO_PYOBJECTS(args, nargs, args_o);
+            STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
             if (CONVERSION_FAILED(args_o)) {
                 DECREF_INPUTS();
                 ERROR_IF(true, error);
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 7285acec0bac..7a9c6ab89c38 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -4596,7 +4596,7 @@
             int nargs = total_args - 1;
             PyCFunctionFastWithKeywords cfunc =
             (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
-            STACKREFS_TO_PYOBJECTS(args, nargs, args_o);
+            STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
             if (CONVERSION_FAILED(args_o)) {
                 PyStackRef_CLOSE(callable);
                 PyStackRef_CLOSE(self_or_null[0]);
@@ -4713,7 +4713,7 @@
             PyCFunctionFast cfunc =
             (PyCFunctionFast)(void(*)(void))meth->ml_meth;
             int nargs = total_args - 1;
-            STACKREFS_TO_PYOBJECTS(args, nargs, args_o);
+            STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
             if (CONVERSION_FAILED(args_o)) {
                 PyStackRef_CLOSE(callable);
                 PyStackRef_CLOSE(self_or_null[0]);
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 58792a2101ab..1201fe82efb9 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -2252,7 +2252,7 @@
                 PyCFunctionFast cfunc =
                 (PyCFunctionFast)(void(*)(void))meth->ml_meth;
                 int nargs = total_args - 1;
-                STACKREFS_TO_PYOBJECTS(args, nargs, args_o);
+                STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
                 if (CONVERSION_FAILED(args_o)) {
                     PyStackRef_CLOSE(callable);
                     PyStackRef_CLOSE(self_or_null[0]);
@@ -2333,7 +2333,7 @@
                 int nargs = total_args - 1;
                 PyCFunctionFastWithKeywords cfunc =
                 (PyCFunctionFastWithKeywords)(void(*)(void))meth->ml_meth;
-                STACKREFS_TO_PYOBJECTS(args, nargs, args_o);
+                STACKREFS_TO_PYOBJECTS(args, total_args, args_o);
                 if (CONVERSION_FAILED(args_o)) {
                     PyStackRef_CLOSE(callable);
                     PyStackRef_CLOSE(self_or_null[0]);