diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-07 13:46:09 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-07-07 13:46:09 +0300 |
| commit | 3bc13cc8b0b85f989b8da9c5718fc5319ad06248 (patch) | |
| tree | 52fc5995a7cc1ccafce61ef403b7dea1a4ff342d /Objects/frameobject.c | |
| parent | 667abc7d42e87b87338981276d0eac9895d4abf4 (diff) | |
| parent | e50dafcd636ba32db890600164698bb070d40d97 (diff) | |
| download | cpython-git-3bc13cc8b0b85f989b8da9c5718fc5319ad06248.tar.gz | |
Merge heads
Diffstat (limited to 'Objects/frameobject.c')
| -rw-r--r-- | Objects/frameobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index 0d6229360e..55ee5630f6 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -786,7 +786,7 @@ map_to_dict(PyObject *map, Py_ssize_t nmap, PyObject *dict, PyObject **values, PyObject *key = PyTuple_GET_ITEM(map, j); PyObject *value = values[j]; assert(PyUnicode_Check(key)); - if (deref) { + if (deref && value != NULL) { assert(PyCell_Check(value)); value = PyCell_GET(value); } |