Issue #8926: getargs.c: release the buffer on error
- "t#" format: don't get the buffer if the object is not a pinned buffer
- getbuffer(): release the buffer on error
(Commit based on r82206 from py3k)
diff --git a/Python/getargs.c b/Python/getargs.c
index 272ce19..686eac5 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1384,6 +1384,10 @@
return converterr(
"bytes or read-only character buffer",
arg, msgbuf, bufsize);
+ if (pb->bf_releasebuffer)
+ return converterr(
+ "string or pinned buffer",
+ arg, msgbuf, bufsize);
if (PyObject_GetBuffer(arg, &view, PyBUF_SIMPLE) != 0)
return converterr("string or single-segment read-only buffer",
@@ -1391,10 +1395,6 @@
count = view.len;
*p = view.buf;
- if (pb->bf_releasebuffer)
- return converterr(
- "string or pinned buffer",
- arg, msgbuf, bufsize);
PyBuffer_Release(&view);
@@ -1460,6 +1460,7 @@
return -1;
}
if (!PyBuffer_IsContiguous(view, 'C')) {
+ PyBuffer_Release(view);
*errmsg = "contiguous buffer";
return -1;
}