From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Thu, 11 Jul 2002 22:01:40 +0000 (+0000)
Subject: Do more robust test of whether global objects are accessible.
X-Git-Tag: v2.3c1~5029
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e1f7a82e9024555a57eb2371aeeb25d5bc15e6a;p=python

Do more robust test of whether global objects are accessible.

PyImport_ImportModule() is not guaranteed to return a module object.
When another type of object was returned, the PyModule_GetDict() call
return NULL and the subsequent GetItem() seg faulted.

Bug fix candidate.
---

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 248436532b..84c1d4f18e 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -1719,10 +1719,7 @@ save_global(Picklerobject *self, PyObject *args, PyObject *name)
 				  "OSS", args, module, global_name);
 		goto finally;
 	}
-	/* borrowed ref */
-	moddict = PyModule_GetDict(mod);        
-	/* borrowed ref */
-	klass = PyDict_GetItemString(moddict, name_str);        
+	klass = PyObject_GetAttrString(mod, name_str);
 	if (klass == NULL) {
 		cPickle_ErrFormat(PicklingError,
 				  "Can't pickle %s: it's not found as %s.%s",
@@ -1730,11 +1727,13 @@ save_global(Picklerobject *self, PyObject *args, PyObject *name)
 		goto finally;
 	}
 	if (klass != args) {
+		Py_DECREF(klass);
 		cPickle_ErrFormat(PicklingError,
 				  "Can't pickle %s: it's not the same object as %s.%s",
 				  "OSS", args, module, global_name);
 		goto finally;
 	}
+	Py_DECREF(klass);
 
 	if ((*self->write_func)(self, &global, 1) < 0)
 		goto finally;