Fix PyTuple_SetItemRef(NULL)

vstinner · vstinner · commit 48c30fdb0efe · 2018-09-04T15:32:54.000+02:00
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
@@ -190,7 +190,7 @@ PyTuple_SetItem(PyObject *op, Py_ssize_t i, PyObject *newitem)
 int
 PyTuple_SetItemRef(PyObject *op, Py_ssize_t i, PyObject *newitem)
 {
-    Py_INCREF(newitem);
+    Py_XINCREF(newitem);
     return PyTuple_SetItem(op, i, newitem);
 }
 
diff --git a/capi_tests/Makefile b/capi_tests/Makefile
@@ -5,7 +5,8 @@ PYTHON_LDFLAGS=-l $(LIBPYTHON) -L $(CPYTHON_SRC)
 CFLAGS=$(shell pkg-config check --cflags) $(PYTHON_CFLAGS)
 LDFLAGS=$(shell pkg-config check --libs) $(PYTHON_LDFLAGS)
 SOURCES=runtests.c test_object.c test_tuple.c
-ENV_RUNTEST=LD_LIBRARY_PATH=$(CPYTHON_SRC) PYTHONPATH=$(CPYTHON_SRC)/Lib
+
+#ENV_RUNTEST=LD_LIBRARY_PATH=$(CPYTHON_SRC) PYTHONPATH=$(CPYTHON_SRC)/Lib
 # CK_FORK=no to detect reference leaks
 ENV_RUNTEST=CK_FORK=no LD_LIBRARY_PATH=$(CPYTHON_SRC) PYTHONPATH=$(CPYTHON_SRC)/Lib
 
diff --git a/capi_tests/test_tuple.c b/capi_tests/test_tuple.c
@@ -276,6 +276,38 @@ check_PyTuple_SetItemRef(func_type ftype)
         Py_DECREF(obj2);
     }
     Py_DECREF(tuple);
+
+    /* Tuple items set explicitly to NULL */
+    tuple = PyTuple_New(size);
+    ck_assert_ptr_nonnull(tuple);
+    for (size_t i = 0; i < size; i++) {
+        switch (ftype)
+        {
+        case STRONG:
+        {
+            int res = PyTuple_SetItemRef(tuple, i, NULL);
+            ck_assert_int_eq(res, 0);
+            break;
+        }
+#ifndef Py_NEWCAPI
+        case BORROW:
+        {
+            int res = PyTuple_SetItem(tuple, i, NULL);
+            ck_assert_int_eq(res, 0);
+            break;
+        }
+        case MACRO:
+        {
+            PyTuple_SET_ITEM(tuple, i, NULL);
+            break;
+        }
+#endif
+        }
+
+        PyObject *item = PyTuple_GetItemRef(tuple, i);
+        ck_assert_ptr_null(item);
+    }
+    Py_DECREF(tuple);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ PyTuple_SetItem(PyObject op, Py_ssize_t i, PyObject newitem)`
`190`	`190`	`int`
`191`	`191`	`PyTuple_SetItemRef(PyObject op, Py_ssize_t i, PyObject newitem)`
`192`	`192`	`{`
`193`		`- Py_INCREF(newitem);`
	`193`	`+ Py_XINCREF(newitem);`
`194`	`194`	`return PyTuple_SetItem(op, i, newitem);`
`195`	`195`	`}`
`196`	`196`