Commit 36468535 authored by Jim Fulton's avatar Jim Fulton

Need to allow deactivation on successfull return from set operations.

parent ada64113
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
static char BTree_module_documentation[] = static char BTree_module_documentation[] =
"" ""
"\n$Id: BTree.c,v 1.25 1999/07/30 21:00:13 jim Exp $" "\n$Id: BTree.c,v 1.26 1999/08/05 13:32:34 jim Exp $"
; ;
#define PERSISTENT #define PERSISTENT
...@@ -1483,8 +1483,8 @@ static PyObject * ...@@ -1483,8 +1483,8 @@ static PyObject *
_bucket_intset_operation(Bucket *self, intSet *other, _bucket_intset_operation(Bucket *self, intSet *other,
int cpysrc, int cpyboth, int cpyoth) int cpysrc, int cpyboth, int cpyoth)
{ {
Bucket *r=0, *o; Bucket *r=0;
int i, l, io, lo, ir; int i, l, io, lo;
Item *d; Item *d;
INTSET_DATA_TYPE *od; INTSET_DATA_TYPE *od;
...@@ -1562,11 +1562,13 @@ _bucket_intset_operation(Bucket *self, intSet *other, ...@@ -1562,11 +1562,13 @@ _bucket_intset_operation(Bucket *self, intSet *other,
} }
PER_ALLOW_DEACTIVATION(self);
PER_ALLOW_DEACTIVATION(other);
return OBJECT(r); return OBJECT(r);
err: err:
PER_ALLOW_DEACTIVATION(self); PER_ALLOW_DEACTIVATION(self);
PER_ALLOW_DEACTIVATION(o); PER_ALLOW_DEACTIVATION(other);
Py_DECREF(r); Py_DECREF(r);
return NULL; return NULL;
} }
...@@ -1576,7 +1578,7 @@ bucket_set_operation(Bucket *self, PyObject *other, ...@@ -1576,7 +1578,7 @@ bucket_set_operation(Bucket *self, PyObject *other,
int cpysrc, int cpyboth, int cpyoth) int cpysrc, int cpyboth, int cpyoth)
{ {
Bucket *r=0, *o; Bucket *r=0, *o;
int i, l, io, lo, ir; int i, l, io, lo;
Item *d, *od; Item *d, *od;
Item v, vo; Item v, vo;
...@@ -1663,6 +1665,8 @@ bucket_set_operation(Bucket *self, PyObject *other, ...@@ -1663,6 +1665,8 @@ bucket_set_operation(Bucket *self, PyObject *other,
} }
} }
PER_ALLOW_DEACTIVATION(self);
PER_ALLOW_DEACTIVATION(o);
return OBJECT(r); return OBJECT(r);
err: err:
...@@ -2098,7 +2102,7 @@ initBTree() ...@@ -2098,7 +2102,7 @@ initBTree()
#endif #endif
{ {
PyObject *m, *d; PyObject *m, *d;
char *rev="$Revision: 1.25 $"; char *rev="$Revision: 1.26 $";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment