diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-08-15 13:18:47 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-08-15 13:18:47 (GMT) |
| commit | f492c364427eb0224fa242ae938cc3cc98f7fe51 (patch) | |
| tree | 1c9d61a95976cba1c55f2e2d58a1f4bac9598294 | |
| parent | 1cfc9c0ef334a3add718a5e01d9658bdf3c9da6d (diff) | |
| download | cpython-f492c364427eb0224fa242ae938cc3cc98f7fe51.zip cpython-f492c364427eb0224fa242ae938cc3cc98f7fe51.tar.gz cpython-f492c364427eb0224fa242ae938cc3cc98f7fe51.tar.bz2 | |
Merged revisions 74457 via svnmerge from
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
........
| -rw-r--r-- | Lib/test/test_module.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Objects/object.c | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py index e0c7ec3..ac99773 100644 --- a/Lib/test/test_module.py +++ b/Lib/test/test_module.py @@ -11,6 +11,7 @@ class ModuleTests(unittest.TestCase): # and __doc__ is None foo = ModuleType.__new__(ModuleType) self.failUnless(foo.__dict__ is None) + self.assertRaises(SystemError, dir, foo) try: s = foo.__name__ self.fail("__name__ = %s" % repr(s)) @@ -12,6 +12,8 @@ What's New in Python 2.6.3 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 index bb3693b..0e97e8c 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1806,9 +1806,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)); + char *name = PyModule_GetName(obj); + if (name) + PyErr_Format(PyExc_TypeError, + "%.200s.__dict__ is not a dictionary", + name); } } |