From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 22 May 2018 02:18:41 +0000 (-0700)
Subject: bpo-33583: Add note in PyObject_GC_Resize() doc (GH-7021)
X-Git-Tag: v3.6.6rc1~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c1e7d8122808d42f9fdb7019061dc2e78a78efa;p=python

bpo-33583: Add note in PyObject_GC_Resize() doc (GH-7021)

(cherry picked from commit 1179f4b40f375af5c59cd4b6be9cc313fa0e1a37)

Co-authored-by: INADA Naoki <methane@users.noreply.github.com>
---

diff --git a/Doc/c-api/gcsupport.rst b/Doc/c-api/gcsupport.rst
index f5e0d7ec9c..7f54b6a9cf 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 754348e20a..0b057ddbf5 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -1773,6 +1773,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);