Issue #13204: Calling sys.flags.__new__ would crash the interpreter, now it raises a TypeError.

This commit is contained in:
Antoine Pitrou 2014-04-28 13:08:28 +02:00
commit 3a74ce2088
3 changed files with 33 additions and 3 deletions

View File

@ -519,6 +519,26 @@ class SysModuleTest(unittest.TestCase):
self.assertTrue(repr(sys.flags)) self.assertTrue(repr(sys.flags))
self.assertEqual(len(sys.flags), len(attrs)) self.assertEqual(len(sys.flags), len(attrs))
def assert_raise_on_new_sys_type(self, sys_attr):
# Users are intentionally prevented from creating new instances of
# sys.flags, sys.version_info, and sys.getwindowsversion.
attr_type = type(sys_attr)
with self.assertRaises(TypeError):
attr_type()
with self.assertRaises(TypeError):
attr_type.__new__(attr_type)
def test_sys_flags_no_instantiation(self):
self.assert_raise_on_new_sys_type(sys.flags)
def test_sys_version_info_no_instantiation(self):
self.assert_raise_on_new_sys_type(sys.version_info)
def test_sys_getwindowsversion_no_instantiation(self):
# Skip if not being run on Windows.
test.support.get_attribute(sys, "getwindowsversion")
self.assert_raise_on_new_sys_type(sys.getwindowsversion())
def test_clear_type_cache(self): def test_clear_type_cache(self):
sys._clear_type_cache() sys._clear_type_cache()

View File

@ -57,6 +57,9 @@ Core and Builtins
Library Library
------- -------
- Issue #13204: Calling sys.flags.__new__ would crash the interpreter,
now it raises a TypeError.
- Issue #19385: Make operations on a closed dbm.dumb database always raise the - Issue #19385: Make operations on a closed dbm.dumb database always raise the
same exception. same exception.

View File

@ -1622,6 +1622,7 @@ PyObject *
_PySys_Init(void) _PySys_Init(void)
{ {
PyObject *m, *sysdict, *version_info; PyObject *m, *sysdict, *version_info;
int res;
m = PyModule_Create(&sysmodule); m = PyModule_Create(&sysmodule);
if (m == NULL) if (m == NULL)
@ -1629,7 +1630,6 @@ _PySys_Init(void)
sysdict = PyModule_GetDict(m); sysdict = PyModule_GetDict(m);
#define SET_SYS_FROM_STRING_BORROW(key, value) \ #define SET_SYS_FROM_STRING_BORROW(key, value) \
do { \ do { \
int res; \
PyObject *v = (value); \ PyObject *v = (value); \
if (v == NULL) \ if (v == NULL) \
return NULL; \ return NULL; \
@ -1640,7 +1640,6 @@ _PySys_Init(void)
} while (0) } while (0)
#define SET_SYS_FROM_STRING(key, value) \ #define SET_SYS_FROM_STRING(key, value) \
do { \ do { \
int res; \
PyObject *v = (value); \ PyObject *v = (value); \
if (v == NULL) \ if (v == NULL) \
return NULL; \ return NULL; \
@ -1759,6 +1758,9 @@ _PySys_Init(void)
/* prevent user from creating new instances */ /* prevent user from creating new instances */
VersionInfoType.tp_init = NULL; VersionInfoType.tp_init = NULL;
VersionInfoType.tp_new = NULL; VersionInfoType.tp_new = NULL;
res = PyDict_DelItemString(VersionInfoType.tp_dict, "__new__");
if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
PyErr_Clear();
/* implementation */ /* implementation */
SET_SYS_FROM_STRING("implementation", make_impl_info(version_info)); SET_SYS_FROM_STRING("implementation", make_impl_info(version_info));
@ -1772,7 +1774,9 @@ _PySys_Init(void)
/* prevent user from creating new instances */ /* prevent user from creating new instances */
FlagsType.tp_init = NULL; FlagsType.tp_init = NULL;
FlagsType.tp_new = NULL; FlagsType.tp_new = NULL;
res = PyDict_DelItemString(FlagsType.tp_dict, "__new__");
if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
PyErr_Clear();
#if defined(MS_WINDOWS) #if defined(MS_WINDOWS)
/* getwindowsversion */ /* getwindowsversion */
@ -1783,6 +1787,9 @@ _PySys_Init(void)
/* prevent user from creating new instances */ /* prevent user from creating new instances */
WindowsVersionType.tp_init = NULL; WindowsVersionType.tp_init = NULL;
WindowsVersionType.tp_new = NULL; WindowsVersionType.tp_new = NULL;
res = PyDict_DelItemString(WindowsVersionType.tp_dict, "__new__");
if (res < 0 && PyErr_ExceptionMatches(PyExc_KeyError))
PyErr_Clear();
#endif #endif
/* float repr style: 0.03 (short) vs 0.029999999999999999 (legacy) */ /* float repr style: 0.03 (short) vs 0.029999999999999999 (legacy) */