commit 1f9d907c9009daf169d5d6fcdcef72f85fc6f3ac
author Alexandre Vassalotti <alexandre@peadrop.com> Fri Aug 15 03:07:47 2008 +0000
committer Alexandre Vassalotti <alexandre@peadrop.com> Fri Aug 15 03:07:47 2008 +0000
tree 7c223ce1e52c1472222c879bb30bf9baa3976490
parent e1e48ea29bc04cff9739f6ab4cb991604060a55f

Issue 3514: Fixed segfault dues to infinite loop in __getattr__.

Modules/_pickle.c

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 0f5b06b..52fa156 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -3834,8 +3834,11 @@
     inst = self->stack->data[self->stack->length - 1];
 
     setstate = PyObject_GetAttrString(inst, "__setstate__");
-    if (setstate == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
-        PyErr_Clear();
+    if (setstate == NULL) {
+        if (PyErr_ExceptionMatches(PyExc_AttributeError))
+            PyErr_Clear();
+        else
+            return -1;
     }
     else {
         PyObject *result;