[Python-checkins] cpython (3.5): Fixed possible abort in ceval loop if _PyUnicode_FromId() fails.

serhiy.storchaka python-checkins at python.org
Tue Nov 8 16:16:05 EST 2016


https://hg.python.org/cpython/rev/691004f9bf11
changeset:   104984:691004f9bf11
branch:      3.5
parent:      104979:e0dd4cc9661a
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Nov 08 23:12:46 2016 +0200
summary:
  Fixed possible abort in ceval loop if _PyUnicode_FromId() fails.
Every opcode should end with DISPATCH() or goto error.

files:
  Python/ceval.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2196,7 +2196,7 @@
             else {
                 PyObject *build_class_str = _PyUnicode_FromId(&PyId___build_class__);
                 if (build_class_str == NULL)
-                    break;
+                    goto error;
                 bc = PyObject_GetItem(f->f_builtins, build_class_str);
                 if (bc == NULL) {
                     if (PyErr_ExceptionMatches(PyExc_KeyError))

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list