mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 18:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-35454: Fix miscellaneous minor issues in error handling. (#11077)

Browse source 
* bpo-35454: Fix miscellaneous minor issues in error handling.

* Fix a null pointer dereference.
This commit is contained in:
Serhiy Storchaka 2018-12-11 08:38:03 +02:00 • committed by GitHub
parent bb86bf4c4e
commit 8905fcc85a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 44 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/ceval.c
View file

@ -5109,7 +5109,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();