gh-111789: Use PyDict_GetItemRef() in Modules/_csv.c (gh-112073)

serhiy-storchaka · web-flow · commit b14e5df120ca · 2023-11-27T18:35:52.000+01:00
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -160,15 +160,9 @@ static PyObject *
 get_dialect_from_registry(PyObject *name_obj, _csvstate *module_state)
 {
     PyObject *dialect_obj;
-
-    dialect_obj = PyDict_GetItemWithError(module_state->dialects, name_obj);
-    if (dialect_obj == NULL) {
-        if (!PyErr_Occurred())
-            PyErr_Format(module_state->error_obj, "unknown dialect");
+    if (PyDict_GetItemRef(module_state->dialects, name_obj, &dialect_obj) == 0) {
+        PyErr_SetString(module_state->error_obj, "unknown dialect");
     }
-    else
-        Py_INCREF(dialect_obj);
-
     return dialect_obj;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -160,15 +160,9 @@ static PyObject *`
`160`	`160`	`get_dialect_from_registry(PyObject name_obj, _csvstate module_state)`
`161`	`161`	`{`
`162`	`162`	`PyObject *dialect_obj;`
`163`		`-`
`164`		`- dialect_obj = PyDict_GetItemWithError(module_state->dialects, name_obj);`
`165`		`- if (dialect_obj == NULL) {`
`166`		`- if (!PyErr_Occurred())`
`167`		`- PyErr_Format(module_state->error_obj, "unknown dialect");`
	`163`	`+ if (PyDict_GetItemRef(module_state->dialects, name_obj, &dialect_obj) == 0) {`
	`164`	`+ PyErr_SetString(module_state->error_obj, "unknown dialect");`
`168`	`165`	`}`
`169`		`- else`
`170`		`- Py_INCREF(dialect_obj);`
`171`		`-`
`172`	`166`	`return dialect_obj;`
`173`	`167`	`}`
`174`	`168`