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

Tue Dec 11 02:27:56 EST 2018

https://github.com/python/cpython/commit/8855d9339858683c9b4fcd50b02a7bca526d4726
commit: 8855d9339858683c9b4fcd50b02a7bca526d4726
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018年12月11日T09:27:50+02:00
summary:
[3.6] bpo-35454: Fix miscellaneous minor issues in error handling. (GH-11077) (GH-11106)
(cherry picked from commit 8905fcc85a6fc3ac394bc89b0bbf40897e9497a6)
files:
M Modules/_elementtree.c
M Modules/_threadmodule.c
M Modules/socketmodule.c
M Objects/namespaceobject.c
M Python/_warnings.c
M Python/ceval.c
M Python/codecs.c
M Python/import.c
M Python/pylifecycle.c

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 5c6959662316..30e382dd6c5e 100644
--- 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
index c504b57b064f..a13b2e07400c 100644
--- 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
index 0daf98b6d238..520867458c1b 100644
--- 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
index 6307ee0423dc..a810effeb3d3 100644
--- 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
index e96e154b0d54..3ae68bb2613b 100644
--- 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
index 38d1d73845fb..36e966470dba 100644
--- 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
index 4ff83014d8bc..584c1ef430de 100644
--- 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
index db1650a9ddd2..cb1927045582 100644
--- 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
index 56f04afc7701..0ebf9c702928 100644
--- 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);
