[pypy-commit] cffi default: Avoid calling more CPython functions when there is an exception set

[arigo]

Author: Armin Rigo <ar...@tunes.org>
Branch: 
Changeset: r2739:12ee26189ebc
Date: 2016-08-22 15:10 +0200
http://bitbucket.org/cffi/cffi/changeset/12ee26189ebc/

Log:    Avoid calling more CPython functions when there is an exception set

diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
--- a/c/_cffi_backend.c
+++ b/c/_cffi_backend.c
@@ -4623,6 +4623,8 @@
                 ct = ct->ct_itemdescr;
             }
             ffifield = fb_fill_type(fb, ct, 0);
+            if (PyErr_Occurred())
+                return NULL;
             if (elements != NULL) {
                 for (j=0; j<flat; j++)
                     elements[nflat++] = ffifield;
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit