[Python-checkins] r74457 - in python/trunk: Lib/test/test_module.py Misc/NEWS Objects/object.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Aug 15 15:16:38 2009
New Revision: 74457

Log:
#6707 fix a crash with dir() on an uninitialized module

Modified:
   python/trunk/Lib/test/test_module.py
   python/trunk/Misc/NEWS
   python/trunk/Objects/object.c

Modified: python/trunk/Lib/test/test_module.py
==============================================================================
--- python/trunk/Lib/test/test_module.py	(original)
+++ python/trunk/Lib/test/test_module.py	Sat Aug 15 15:16:38 2009
@@ -11,6 +11,7 @@
         # and __doc__ is None
         foo = ModuleType.__new__(ModuleType)
         self.assertTrue(foo.__dict__ is None)
+        self.assertRaises(SystemError, dir, foo)
         try:
             s = foo.__name__
             self.fail("__name__ = %s" % repr(s))

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Aug 15 15:16:38 2009
@@ -12,6 +12,8 @@
 Core and Builtins
 -----------------
 
+- Issue #6707: dir() on an uninitialized module caused a crash.
+
 - Issue #6540: Fixed crash for bytearray.translate() with invalid parameters.
 
 - Issue #6573: set.union() stopped processing inputs if an instance of self

Modified: python/trunk/Objects/object.c
==============================================================================
--- python/trunk/Objects/object.c	(original)
+++ python/trunk/Objects/object.c	Sat Aug 15 15:16:38 2009
@@ -1810,9 +1810,11 @@
 		if (PyDict_Check(dict))
 			result = PyDict_Keys(dict);
 		else {
-			PyErr_Format(PyExc_TypeError,
-				     "%.200s.__dict__ is not a dictionary",
-				     PyModule_GetName(obj));
+			char *name = PyModule_GetName(obj);
+			if (name)
+				PyErr_Format(PyExc_TypeError,
+					     "%.200s.__dict__ is not a dictionary",
+					     name);
 		}
 	}