summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-07-30 00:04:35 (GMT)
committerGuido van Rossum <guido@python.org>2007-07-30 00:04:35 (GMT)
commit7a2653438ad584d829ac058d5b924c187cc71408 (patch)
tree6a1077efc6421a2d2b08d60e8c43427c39ac9edd
parent447d33ead62b6dcd46d475a703f59940eb85428b (diff)
downloadcpython-7a2653438ad584d829ac058d5b924c187cc71408.zip
cpython-7a2653438ad584d829ac058d5b924c187cc71408.tar.gz
cpython-7a2653438ad584d829ac058d5b924c187cc71408.tar.bz2
Add a missing "rf.depth = 0;" to marshal_load().
Reported by Joe Smith. This makes the CYGWIN tests pass; it's a miracle it didn't fail on other platforms. Seems like it was accidentally dropped (maybe a merge artifact?).
-rw-r--r--Python/marshal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 0b275f0..975ec8d 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1181,6 +1181,7 @@ marshal_load(PyObject *self, PyObject *f)
return NULL;
}
rf.strings = PyList_New(0);
+ rf.depth = 0;
result = read_object(&rf);
Py_DECREF(rf.strings);
Py_DECREF(data);