Fix #2702, with a correct accounting of recursion.
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index afa75fd..7f4ad7e 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -339,7 +339,6 @@
int bin;
int fast; /* Fast mode doesn't save in memo, don't use if circ ref */
- int nesting;
int (*write_func)(struct Picklerobject *, const char *, Py_ssize_t);
char *write_buf;
int buf_size;
@@ -1630,7 +1629,12 @@
iter = PyObject_GetIter(args);
if (iter == NULL)
goto finally;
- res = batch_list(self, iter);
+
+ if (Py_EnterRecursiveCall(" while pickling an object") == 0)
+ {
+ res = batch_list(self, iter);
+ Py_LeaveRecursiveCall();
+ }
Py_DECREF(iter);
finally:
@@ -1786,7 +1790,11 @@
iter = PyObject_CallMethod(args, "iteritems", "()");
if (iter == NULL)
goto finally;
- res = batch_dict(self, iter);
+ if (Py_EnterRecursiveCall(" while pickling an object") == 0)
+ {
+ res = batch_dict(self, iter);
+ Py_LeaveRecursiveCall();
+ }
Py_DECREF(iter);
finally:
@@ -2306,11 +2314,8 @@
int res = -1;
int tmp, size;
- if (self->nesting++ > Py_GetRecursionLimit()){
- PyErr_SetString(PyExc_RuntimeError,
- "maximum recursion depth exceeded");
- goto finally;
- }
+ if (Py_EnterRecursiveCall(" while pickling an object"))
+ return -1;
if (!pers_save && self->pers_func) {
if ((tmp = save_pers(self, args, self->pers_func)) != 0) {
@@ -2559,7 +2564,7 @@
res = save_reduce(self, t, args);
finally:
- self->nesting--;
+ Py_LeaveRecursiveCall();
Py_XDECREF(py_ob_id);
Py_XDECREF(__reduce__);
Py_XDECREF(t);
@@ -2801,7 +2806,6 @@
self->inst_pers_func = NULL;
self->write_buf = NULL;
self->fast = 0;
- self->nesting = 0;
self->fast_container = 0;
self->fast_memo = NULL;
self->buf_size = 0;