diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-12-11 09:27:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 09:27:50 +0200 |
| commit | 8855d9339858683c9b4fcd50b02a7bca526d4726 (patch) | |
| tree | 3c85fc696f92556807f1031f9653ed3b73d70561 /Python/ceval.c | |
| parent | 37607f26697351751165a042f91f04530ce333f7 (diff) | |
| download | cpython-git-8855d9339858683c9b4fcd50b02a7bca526d4726.tar.gz | |
[3.6] bpo-35454: Fix miscellaneous minor issues in error handling. (GH-11077) (GH-11106)
(cherry picked from commit 8905fcc85a6fc3ac394bc89b0bbf40897e9497a6)
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 38d1d73845..36e966470d 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(); |