Backport Neil Schemenauer's fix for SF #529750,

Circular reference makes Py_Init crash

Modified to keep _Py_ResetReferences() API, but make it a no-op.
It's not called now (for 2.3 it was completely removed).

diff --git a/Objects/object.c b/Objects/object.c
index 51801d80a2c437539ddd4ae18db74c72406a4e46..b14a9c07e8c27dbae2c9d57da8c9f9bf2da7696b 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1784,8 +1784,6 @@ static PyObject refchain = {&refchain, &refchain};
 void
 _Py_ResetReferences(void)
 {
-       refchain._ob_prev = refchain._ob_next = &refchain;
-       _Py_RefTotal = 0;
 }
 
 void

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4b5cba585159c5950b1909e7b1be458715dca006..51d71e0da453888c0e08c538a96dbc27f2402971 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -277,10 +277,6 @@ Py_Finalize(void)
        PyGrammar_RemoveAccelerators(&_PyParser_Grammar);
 
        call_ll_exitfuncs();
-
-#ifdef Py_TRACE_REFS
-       _Py_ResetReferences();
-#endif /* Py_TRACE_REFS */
 }
 
 /* Create and initialize a new interpreter and thread, and return the