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 /PC | |
| 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 'PC')
| -rw-r--r-- | PC/winreg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PC/winreg.c b/PC/winreg.c index e53a448..1536e17 100644 --- a/PC/winreg.c +++ b/PC/winreg.c @@ -814,13 +814,13 @@ Py2Reg(PyObject *value, DWORD typ, BYTE **retDataBuf, DWORD *retDataSize) *retDataBuf = (BYTE *)PyMem_NEW(char, view.len); if (*retDataBuf==NULL){ - PyObject_ReleaseBuffer(value, &view); + PyBuffer_Release(&view); PyErr_NoMemory(); return FALSE; } *retDataSize = view.len; memcpy(*retDataBuf, view.buf, view.len); - PyObject_ReleaseBuffer(value, &view); + PyBuffer_Release(&view); } break; } |