changeset:   71347:1ae0b7b8de0b
branch:      3.2
parent:      71345:a19e99625c8a
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Fri Jul 15 21:01:21 2011 +0200
files:       Misc/NEWS Modules/_pickle.c
description:
Issue #11321: Fix a crash with multiple imports of the _pickle module when
embedding Python.  Patch by Andreas Stührk.


diff -r a19e99625c8a -r 1ae0b7b8de0b Misc/NEWS
--- a/Misc/NEWS	Fri Jul 15 20:25:20 2011 +0200
+++ b/Misc/NEWS	Fri Jul 15 21:01:21 2011 +0200
@@ -27,6 +27,9 @@
 Library
 -------
 
+- Issue #11321: Fix a crash with multiple imports of the _pickle module when
+  embedding Python.  Patch by Andreas Stührk.
+
 - Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
 
 - Issue #4376: ctypes now supports nested structures in a endian different than
diff -r a19e99625c8a -r 1ae0b7b8de0b Modules/_pickle.c
--- a/Modules/_pickle.c	Fri Jul 15 20:25:20 2011 +0200
+++ b/Modules/_pickle.c	Fri Jul 15 21:01:21 2011 +0200
@@ -6321,8 +6321,10 @@
     if (m == NULL)
         return NULL;
 
+    Py_INCREF(&Pickler_Type);
     if (PyModule_AddObject(m, "Pickler", (PyObject *)&Pickler_Type) < 0)
         return NULL;
+    Py_INCREF(&Unpickler_Type);
     if (PyModule_AddObject(m, "Unpickler", (PyObject *)&Unpickler_Type) < 0)
         return NULL;