Fix exception handling in lookup_maybe

729feee3 · Kevin Modzelewski · 4a114aaa · 729feee3
Commit 729feee3 authored Jul 27, 2015 by Kevin Modzelewski
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

src/capi/typeobject.cpp src/capi/typeobject.cpp +8 -2

No files found.
--- a/src/capi/typeobject.cpp
+++ b/src/capi/typeobject.cpp
@@ -532,8 +532,14 @@ static PyObject* lookup_maybe(PyObject* self, const char* attrstr, PyObject** at
    }
    Box* obj = typeLookup(self->cls, (BoxedString*)*attrobj, NULL);
-    if (obj)
+    if (obj) {
-        return processDescriptor(obj, self, self->cls);
+        try {
+            return processDescriptor(obj, self, self->cls);
+        } catch (ExcInfo e) {
+            setCAPIException(e);
+            return NULL;
+        }
+    }
    return obj;
 }