diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-08-13 15:53:07 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-08-13 15:53:07 (GMT) |
| commit | 423be95dcf55b0b8737207beb7b30eb549430dba (patch) | |
| tree | b23453f2dc43d809aca931203a9580a81bd938fe /Modules/_json.c | |
| parent | 688356f59f3b0fe2412a5f66b79f0f9fdc4a98d2 (diff) | |
| download | cpython-423be95dcf55b0b8737207beb7b30eb549430dba.zip cpython-423be95dcf55b0b8737207beb7b30eb549430dba.tar.gz cpython-423be95dcf55b0b8737207beb7b30eb549430dba.tar.bz2 | |
Merged revisions 65654 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65654 | martin.v.loewis | 2008-08-12 16:49:50 +0200 (Tue, 12 Aug 2008) | 6 lines
Issue #3139: Make buffer-interface thread-safe wrt. PyArg_ParseTuple,
by denying s# to parse objects that have a releasebuffer procedure,
and introducing s*.
More module might need to get converted to use s*.
........
Diffstat (limited to 'Modules/_json.c')
| -rw-r--r-- | Modules/_json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_json.c b/Modules/_json.c index 1cf1e63..a724f89 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -261,7 +261,7 @@ scanstring_str(PyObject *pystr, Py_ssize_t end, char *encoding, int strict) /* Pick up this chunk if it's not zero length */ if (next != end) { PyObject *strchunk; - if (PyBuffer_FillInfo(&info, &buf[end], next - end, 1, 0) < 0) { + if (PyBuffer_FillInfo(&info, NULL, &buf[end], next - end, 1, 0) < 0) { goto bail; } strchunk = PyMemoryView_FromMemory(&info); |