Merged revisions 74457 via svnmerge from

benjaminp · benjaminp · commit 1432771d55b2 · 2009-08-15T13:23:05.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74457 | benjamin.peterson | 2009-08-15 08:16:38 -0500 (Sat, 15 Aug 2009) | 1 line #6707 fix a crash with dir() on an uninitialized module ........
diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py
@@ -11,6 +11,7 @@ def test_uninitialized(self):
         # 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))
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 1?
 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
diff --git a/Objects/object.c b/Objects/object.c
@@ -1265,9 +1265,11 @@ _specialized_dir_module(PyObject *obj)
 		if (PyDict_Check(dict))
 			result = PyDict_Keys(dict);
 		else {
-			PyErr_Format(PyExc_TypeError,
-				     "%.200s.__dict__ is not a dictionary",
-				     PyModule_GetName(obj));
+			const char *name = PyModule_GetName(obj);
+			if (name)
+				PyErr_Format(PyExc_TypeError,
+					     "%.200s.__dict__ is not a dictionary",
+					     name);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1265,9 +1265,11 @@ _specialized_dir_module(PyObject *obj)`
`1265`	`1265`	`if (PyDict_Check(dict))`
`1266`	`1266`	`result = PyDict_Keys(dict);`
`1267`	`1267`	`else {`
`1268`		`- PyErr_Format(PyExc_TypeError,`
`1269`		`- "%.200s.__dict__ is not a dictionary",`
`1270`		`- PyModule_GetName(obj));`
	`1268`	`+ const char *name = PyModule_GetName(obj);`
	`1269`	`+ if (name)`
	`1270`	`+ PyErr_Format(PyExc_TypeError,`
	`1271`	`+ "%.200s.__dict__ is not a dictionary",`
	`1272`	`+ name);`
`1271`	`1273`	`}`
`1272`	`1274`	`}`
`1273`	`1275`