Mercurial > cpython-lru_cache-weakref
diff Modules/_json.c @ 48683:cd3b0b7fd8e1
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*.
........
| author | Martin v. Löwis <martin@v.loewis.de> |
|---|---|
| date | Wed, 13 Aug 2008 15:53:07 +0000 |
| parents | 8cdb181aa9af |
| children | 7511f3e672a2 |
line wrap: on
line diff
--- a/Modules/_json.c Tue Aug 12 17:09:27 2008 +0000 +++ b/Modules/_json.c Wed Aug 13 15:53:07 2008 +0000 @@ -261,7 +261,7 @@ /* 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);