summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2004-12-20 12:25:57 (GMT)
committerArmin Rigo <arigo@tunes.org>2004-12-20 12:25:57 (GMT)
commit2ccea1785603ad35a05f75f40e9dc7fc82caa346 (patch)
treed20a28547d53beb536dd97b5a11d238945d42c18 /Python
parentf964154b8cb74a05a3664cd34e938c0298f97680 (diff)
downloadcpython-2ccea1785603ad35a05f75f40e9dc7fc82caa346.zip
cpython-2ccea1785603ad35a05f75f40e9dc7fc82caa346.tar.gz
cpython-2ccea1785603ad35a05f75f40e9dc7fc82caa346.tar.bz2
Any call to marshal.dumps() with the new optional argument 'version' just
immediately segfaults, due to a typo! This was obviously never tested... Added a test for it, and also fixed the documentation.
Diffstat (limited to 'Python')
-rw-r--r--Python/marshal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 590e1ca..0ab0597 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -893,7 +893,7 @@ marshal_dumps(PyObject *self, PyObject *args)
{
PyObject *x;
int version = Py_MARSHAL_VERSION;
- if (!PyArg_ParseTuple(args, "O|i:dumps", &x, version))
+ if (!PyArg_ParseTuple(args, "O|i:dumps", &x, &version))
return NULL;
return PyMarshal_WriteObjectToString(x, version);
}