summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorINADA Naoki <methane@users.noreply.github.com>2018-05-21 09:35:41 (GMT)
committerGitHub <noreply@github.com>2018-05-21 09:35:41 (GMT)
commit1179f4b40f375af5c59cd4b6be9cc313fa0e1a37 (patch)
treeb1c19c071e484c60f207a77571bc34a3a2ea4951
parente2537521916c5bf88fcf54d4654ff1bcd332be4a (diff)
downloadcpython-1179f4b40f375af5c59cd4b6be9cc313fa0e1a37.zip
cpython-1179f4b40f375af5c59cd4b6be9cc313fa0e1a37.tar.gz
cpython-1179f4b40f375af5c59cd4b6be9cc313fa0e1a37.tar.bz2
bpo-33583: Add note in PyObject_GC_Resize() doc (GH-7021)
-rw-r--r--Doc/c-api/gcsupport.rst2
-rw-r--r--Modules/gcmodule.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/Doc/c-api/gcsupport.rst b/Doc/c-api/gcsupport.rst
index f5e0d7e..7f54b6a 100644
--- a/Doc/c-api/gcsupport.rst
+++ b/Doc/c-api/gcsupport.rst
@@ -49,7 +49,7 @@ Constructors for container types must conform to two rules:
.. c:function:: TYPE* PyObject_GC_Resize(TYPE, PyVarObject *op, Py_ssize_t newsize)
Resize an object allocated by :c:func:`PyObject_NewVar`. Returns the
- resized object or *NULL* on failure.
+ resized object or *NULL* on failure. *op* must not be tracked by the collector yet.
.. c:function:: void PyObject_GC_Track(PyObject *op)
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index 8ba1093..09c7356 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -1752,6 +1752,7 @@ _PyObject_GC_Resize(PyVarObject *op, Py_ssize_t nitems)
{
const size_t basicsize = _PyObject_VAR_SIZE(Py_TYPE(op), nitems);
PyGC_Head *g = AS_GC(op);
+ assert(!IS_TRACKED(op));
if (basicsize > PY_SSIZE_T_MAX - sizeof(PyGC_Head))
return (PyVarObject *)PyErr_NoMemory();
g = (PyGC_Head *)PyObject_REALLOC(g, sizeof(PyGC_Head) + basicsize);