[3.6] bpo-35454: Fix miscellaneous minor issues in error handling. (GH-11077) (GH-11106)

serhiy-storchaka · web-flow · commit 8855d9339858 · 2018-12-11T09:27:50.000+02:00
(cherry picked from commit 8905fcc)
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
@@ -352,7 +352,10 @@ get_attrib_from_keywords(PyObject *kwds)
             return NULL;
         }
         attrib = PyDict_Copy(attrib);
-        PyDict_DelItem(kwds, attrib_str);
+        if (attrib && PyDict_DelItem(kwds, attrib_str) < 0) {
+            Py_DECREF(attrib);
+            attrib = NULL;
+        }
     } else {
         attrib = PyDict_New();
     }
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
@@ -785,9 +785,11 @@ local_clear(localobject *self)
         for(tstate = PyInterpreterState_ThreadHead(tstate->interp);
             tstate;
             tstate = PyThreadState_Next(tstate))
-            if (tstate->dict &&
-                PyDict_GetItem(tstate->dict, self->key))
-                PyDict_DelItem(tstate->dict, self->key);
+            if (tstate->dict && PyDict_GetItem(tstate->dict, self->key)) {
+                if (PyDict_DelItem(tstate->dict, self->key)) {
+                    PyErr_Clear();
+                }
+            }
     }
     return 0;
 }
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -367,10 +367,14 @@ remove_unusable_flags(PyObject *m)
         else {
             if (PyDict_GetItemString(
                     dict,
-                    win_runtime_flags[i].flag_name) != NULL) {
-                PyDict_DelItemString(
-                    dict,
-                    win_runtime_flags[i].flag_name);
+                    win_runtime_flags[i].flag_name) != NULL)
+            {
+                if (PyDict_DelItemString(
+                        dict,
+                        win_runtime_flags[i].flag_name))
+                {
+                    PyErr_Clear();
+                }
             }
         }
     }
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
@@ -109,15 +109,15 @@ namespace_repr(PyObject *ns)
             PyObject *value, *item;
 
             value = PyDict_GetItem(d, key);
-            assert(value != NULL);
-
-            item = PyUnicode_FromFormat("%S=%R", key, value);
-            if (item == NULL) {
-                loop_error = 1;
-            }
-            else {
-                loop_error = PyList_Append(pairs, item);
-                Py_DECREF(item);
+            if (value != NULL) {
+                item = PyUnicode_FromFormat("%S=%R", key, value);
+                if (item == NULL) {
+                    loop_error = 1;
+                }
+                else {
+                    loop_error = PyList_Append(pairs, item);
+                    Py_DECREF(item);
+                }
             }
         }
 
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -248,7 +248,11 @@ already_warned(PyObject *registry, PyObject *key, int should_set)
     version_obj = _PyDict_GetItemId(registry, &PyId_version);
     if (version_obj == NULL
         || !PyLong_CheckExact(version_obj)
-        || PyLong_AsLong(version_obj) != _filters_version) {
+        || PyLong_AsLong(version_obj) != _filters_version)
+    {
+        if (PyErr_Occurred()) {
+            return -1;
+        }
         PyDict_Clear(registry);
         version_obj = PyLong_FromLong(_filters_version);
         if (version_obj == NULL)
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -5471,7 +5471,7 @@ unicode_concatenate(PyObject *v, PyObject *w,
             PyObject *names = f->f_code->co_names;
             PyObject *name = GETITEM(names, oparg);
             PyObject *locals = f->f_locals;
-            if (PyDict_CheckExact(locals) &&
+            if (locals && PyDict_CheckExact(locals) &&
                 PyDict_GetItem(locals, name) == v) {
                 if (PyDict_DelItem(locals, name) != 0) {
                     PyErr_Clear();
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -129,8 +129,10 @@ PyObject *_PyCodec_Lookup(const char *encoding)
 
     /* Next, scan the search functions in order of registration */
     args = PyTuple_New(1);
-    if (args == NULL)
-        goto onError;
+    if (args == NULL) {
+        Py_DECREF(v);
+        return NULL;
+    }
     PyTuple_SET_ITEM(args,0,v);
 
     len = PyList_Size(interp->codec_search_path);
diff --git a/Python/import.c b/Python/import.c
@@ -1973,10 +1973,10 @@ _imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file)
     }
 
     mod = _PyImport_FindExtensionObject(name, path);
-    if (mod != NULL) {
+    if (mod != NULL || PyErr_Occurred()) {
         Py_DECREF(name);
         Py_DECREF(path);
-        Py_INCREF(mod);
+        Py_XINCREF(mod);
         return mod;
     }
 
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -797,6 +797,9 @@ Py_NewInterpreter(void)
             goto handle_error;
         Py_INCREF(interp->builtins);
     }
+    else if (PyErr_Occurred()) {
+        goto handle_error;
+    }
 
     /* initialize builtin exceptions */
     _PyExc_Init(bimod);

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,10 @@ get_attrib_from_keywords(PyObject *kwds)`
`352`	`352`	`return NULL;`
`353`	`353`	`}`
`354`	`354`	`attrib = PyDict_Copy(attrib);`
`355`		`- PyDict_DelItem(kwds, attrib_str);`
	`355`	`+ if (attrib && PyDict_DelItem(kwds, attrib_str) < 0) {`
	`356`	`+ Py_DECREF(attrib);`
	`357`	`+ attrib = NULL;`
	`358`	`+ }`
`356`	`359`	`} else {`
`357`	`360`	`attrib = PyDict_New();`
`358`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -367,10 +367,14 @@ remove_unusable_flags(PyObject *m)`
`367`	`367`	`else {`
`368`	`368`	`if (PyDict_GetItemString(`
`369`	`369`	`dict,`
`370`		`- win_runtime_flags[i].flag_name) != NULL) {`
`371`		`- PyDict_DelItemString(`
`372`		`- dict,`
`373`		`- win_runtime_flags[i].flag_name);`
	`370`	`+ win_runtime_flags[i].flag_name) != NULL)`
	`371`	`+ {`
	`372`	`+ if (PyDict_DelItemString(`
	`373`	`+ dict,`
	`374`	`+ win_runtime_flags[i].flag_name))`
	`375`	`+ {`
	`376`	`+ PyErr_Clear();`
	`377`	`+ }`
`374`	`378`	`}`
`375`	`379`	`}`
`376`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1973,10 +1973,10 @@ _imp_create_dynamic_impl(PyObject module, PyObject spec, PyObject *file)`
`1973`	`1973`	`}`
`1974`	`1974`
`1975`	`1975`	`mod = _PyImport_FindExtensionObject(name, path);`
`1976`		`- if (mod != NULL) {`
	`1976`	`+ if (mod != NULL \|\| PyErr_Occurred()) {`
`1977`	`1977`	`Py_DECREF(name);`
`1978`	`1978`	`Py_DECREF(path);`
`1979`		`- Py_INCREF(mod);`
	`1979`	`+ Py_XINCREF(mod);`
`1980`	`1980`	`return mod;`
`1981`	`1981`	`}`
`1982`	`1982`
Original file line number	Diff line number	Diff line change
`@@ -797,6 +797,9 @@ Py_NewInterpreter(void)`
`797`	`797`	`goto handle_error;`
`798`	`798`	`Py_INCREF(interp->builtins);`
`799`	`799`	`}`
	`800`	`+ else if (PyErr_Occurred()) {`
	`801`	`+ goto handle_error;`
	`802`	`+ }`
`800`	`803`
`801`	`804`	`/* initialize builtin exceptions */`
`802`	`805`	`_PyExc_Init(bimod);`