Check that the name is a string.

Author: serhiy-storchaka

Lib/test/test_capi/test_misc.py

@@ -1107,8 +1107,7 @@ def test_sys_getattr(self):
 
         with self.assertRaisesRegex(RuntimeError, r'lost sys\.nonexisting'):
             sys_getattr('nonexisting')
-        with self.assertRaisesRegex(RuntimeError, r'lost sys\.1'):
-            sys_getattr(1)
+        self.assertRaises(TypeError, sys_getattr, 1)
         self.assertRaises(TypeError, sys_getattr, [])
         # CRASHES sys_getattr(NULL)
 
@@ -1132,7 +1131,7 @@ def test_sys_getoptionalattr(self):
             self.assertEqual(getoptionalattr('\U0001f40d'), 42)
 
         self.assertIs(getoptionalattr('nonexisting'), AttributeError)
-        self.assertIs(getoptionalattr(1), AttributeError)
+        self.assertRaises(TypeError, getoptionalattr, 1)
         self.assertRaises(TypeError, getoptionalattr, [])
         # CRASHES getoptionalattr(NULL)
 

Python/sysmodule.c

@@ -74,6 +74,12 @@ module sys
 PyObject *
 PySys_GetAttr(PyObject *name)
 {
+    if (!PyUnicode_Check(name)) {
+        PyErr_Format(PyExc_TypeError,
+                     "attribute name must be string, not '%.200s'",
+                     Py_TYPE(name)->tp_name);
+        return NULL;
+    }
     PyThreadState *tstate = _PyThreadState_GET();
     PyObject *sysdict = tstate->interp->sysdict;
     if (sysdict == NULL) {
@@ -106,6 +112,13 @@ PySys_GetAttrString(const char *name)
 int
 PySys_GetOptionalAttr(PyObject *name, PyObject **value)
 {
+    if (!PyUnicode_Check(name)) {
+        PyErr_Format(PyExc_TypeError,
+                     "attribute name must be string, not '%.200s'",
+                     Py_TYPE(name)->tp_name);
+        *value = NULL;
+        return -1;
+    }
     PyThreadState *tstate = _PyThreadState_GET();
     PyObject *sysdict = tstate->interp->sysdict;
     if (sysdict == NULL) {