From: Serhiy Storchaka <storchaka@gmail.com>
Date: Tue, 8 Nov 2016 21:12:46 +0000 (+0200)
Subject: Fixed possible abort in ceval loop if _PyUnicode_FromId() fails.
X-Git-Tag: v3.6.0b4~125^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70b72f0f96d0a78e7cb154ae64356c82d06ac901;p=thirdparty%2FPython%2Fcpython.git

Fixed possible abort in ceval loop if _PyUnicode_FromId() fails.
Every opcode should end with DISPATCH() or goto error.
---

diff --git a/Python/ceval.c b/Python/ceval.c
index e9d0cbb97631..7b405188d38c 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2196,7 +2196,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
             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))