Issue python#29507: Fix _PyObject_CallFunctionVa()

vstinner · vstinner · commit fe4ff83049fc · 2017-02-10T00:41:06.000+01:00
is_size_t test was reversed. Bug spotted by INADA Naoki.
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -2616,10 +2616,12 @@ _PyObject_CallFunctionVa(PyObject *callable, const char *format,
     }
 
     if (is_size_t) {
-        stack = _Py_VaBuildStack(small_stack, small_stack_len, format, va, &nargs);
+        stack = _Py_VaBuildStack_SizeT(small_stack, small_stack_len,
+                                       format, va, &nargs);
     }
     else {
-        stack = _Py_VaBuildStack_SizeT(small_stack, small_stack_len, format, va, &nargs);
+        stack = _Py_VaBuildStack(small_stack, small_stack_len,
+                                 format, va, &nargs);
     }
     if (stack == NULL) {
         return NULL;

Original file line number	Diff line number	Diff line change
`@@ -2616,10 +2616,12 @@ _PyObject_CallFunctionVa(PyObject callable, const char format,`
`2616`	`2616`	`}`
`2617`	`2617`
`2618`	`2618`	`if (is_size_t) {`
`2619`		`- stack = _Py_VaBuildStack(small_stack, small_stack_len, format, va, &nargs);`
	`2619`	`+ stack = _Py_VaBuildStack_SizeT(small_stack, small_stack_len,`
	`2620`	`+ format, va, &nargs);`
`2620`	`2621`	`}`
`2621`	`2622`	`else {`
`2622`		`- stack = _Py_VaBuildStack_SizeT(small_stack, small_stack_len, format, va, &nargs);`
	`2623`	`+ stack = _Py_VaBuildStack(small_stack, small_stack_len,`
	`2624`	`+ format, va, &nargs);`
`2623`	`2625`	`}`
`2624`	`2626`	`if (stack == NULL) {`
`2625`	`2627`	`return NULL;`