Fix bug in malloc case

Fidget-Spinner · Fidget-Spinner · commit ce77fe4197f0 · 2024-06-27T01:42:17.000+08:00
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -702,10 +702,12 @@ _PyObjectArray_FromStackRefArray(_PyStackRef *input, Py_ssize_t nargs, PyObject
 {
     PyObject **result;
     if (nargs > MAX_STACKREF_SCRATCH) {
-        result = PyMem_Malloc(nargs * sizeof(PyObject *));
+        // +1 in case PY_VECTORCALL_ARGUMENTS_OFFSET is set.
+        result = PyMem_Malloc((nargs + 1) * sizeof(PyObject *));
         if (result == NULL) {
             return NULL;
         }
+        result++;
     }
     else {
         result = scratch;
diff --git a/Python/ceval_macros.h b/Python/ceval_macros.h
@@ -469,7 +469,7 @@ do { \
 #ifdef Py_GIL_DISABLED
 #define STACKREFS_TO_PYOBJECTS_CLEANUP(NAME) \
     /* +1 because we +1 previously */ \
-    _PyObjectArray_Free(NAME, NAME##_temp + 1);
+    _PyObjectArray_Free(NAME - 1, NAME##_temp);
 #else
 #define STACKREFS_TO_PYOBJECTS_CLEANUP(NAME) \
     (void)(NAME);

Original file line number	Diff line number	Diff line change
`@@ -702,10 +702,12 @@ _PyObjectArray_FromStackRefArray(_PyStackRef *input, Py_ssize_t nargs, PyObject`
`702`	`702`	`{`
`703`	`703`	`PyObject **result;`
`704`	`704`	`if (nargs > MAX_STACKREF_SCRATCH) {`
`705`		`- result = PyMem_Malloc(nargs * sizeof(PyObject *));`
	`705`	`+ // +1 in case PY_VECTORCALL_ARGUMENTS_OFFSET is set.`
	`706`	`+ result = PyMem_Malloc((nargs + 1) * sizeof(PyObject *));`
`706`	`707`	`if (result == NULL) {`
`707`	`708`	`return NULL;`
`708`	`709`	`}`
	`710`	`+ result++;`
`709`	`711`	`}`
`710`	`712`	`else {`
`711`	`713`	`result = scratch;`