bpo-42260: Improve error handling in _PyConfig_FromDict (pythonGH-23488)

serhiy-storchaka · web-flow · commit 14d81dcaf827 · 2020-11-24T14:07:32.000+02:00
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -1050,8 +1050,8 @@ _PyConfig_AsDict(const PyConfig *config)
 static PyObject*
 config_dict_get(PyObject *dict, const char *name)
 {
-    PyObject *item = PyDict_GetItemString(dict, name);
-    if (item == NULL) {
+    PyObject *item = _PyDict_GetItemStringWithError(dict, name);
+    if (item == NULL && !PyErr_Occurred()) {
         PyErr_Format(PyExc_ValueError, "missing config key: %s", name);
         return NULL;
     }
@@ -1085,7 +1085,7 @@ config_dict_get_int(PyObject *dict, const char *name, int *result)
         if (PyErr_ExceptionMatches(PyExc_TypeError)) {
             config_dict_invalid_type(name);
         }
-        else {
+        else if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
             config_dict_invalid_value(name);
         }
         return -1;
@@ -1104,7 +1104,12 @@ config_dict_get_ulong(PyObject *dict, const char *name, unsigned long *result)
     }
     unsigned long value = PyLong_AsUnsignedLong(item);
     if (value == (unsigned long)-1 && PyErr_Occurred()) {
-        config_dict_invalid_value(name);
+        if (PyErr_ExceptionMatches(PyExc_TypeError)) {
+            config_dict_invalid_type(name);
+        }
+        else if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+            config_dict_invalid_value(name);
+        }
         return -1;
     }
     *result = value;

Original file line number	Diff line number	Diff line change
`@@ -1050,8 +1050,8 @@ _PyConfig_AsDict(const PyConfig *config)`
`1050`	`1050`	`static PyObject*`
`1051`	`1051`	`config_dict_get(PyObject dict, const char name)`
`1052`	`1052`	`{`
`1053`		`- PyObject *item = PyDict_GetItemString(dict, name);`
`1054`		`- if (item == NULL) {`
	`1053`	`+ PyObject *item = _PyDict_GetItemStringWithError(dict, name);`
	`1054`	`+ if (item == NULL && !PyErr_Occurred()) {`
`1055`	`1055`	`PyErr_Format(PyExc_ValueError, "missing config key: %s", name);`
`1056`	`1056`	`return NULL;`
`1057`	`1057`	`}`
`@@ -1085,7 +1085,7 @@ config_dict_get_int(PyObject dict, const char name, int *result)`
`1085`	`1085`	`if (PyErr_ExceptionMatches(PyExc_TypeError)) {`
`1086`	`1086`	`config_dict_invalid_type(name);`
`1087`	`1087`	`}`
`1088`		`- else {`
	`1088`	`+ else if (PyErr_ExceptionMatches(PyExc_OverflowError)) {`
`1089`	`1089`	`config_dict_invalid_value(name);`
`1090`	`1090`	`}`
`1091`	`1091`	`return -1;`
`@@ -1104,7 +1104,12 @@ config_dict_get_ulong(PyObject dict, const char name, unsigned long *result)`
`1104`	`1104`	`}`
`1105`	`1105`	`unsigned long value = PyLong_AsUnsignedLong(item);`
`1106`	`1106`	`if (value == (unsigned long)-1 && PyErr_Occurred()) {`
`1107`		`- config_dict_invalid_value(name);`
	`1107`	`+ if (PyErr_ExceptionMatches(PyExc_TypeError)) {`
	`1108`	`+ config_dict_invalid_type(name);`
	`1109`	`+ }`
	`1110`	`+ else if (PyErr_ExceptionMatches(PyExc_OverflowError)) {`
	`1111`	`+ config_dict_invalid_value(name);`
	`1112`	`+ }`
`1108`	`1113`	`return -1;`
`1109`	`1114`	`}`
`1110`	`1115`	`*result = value;`