From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 2 Feb 2015 23:49:18 +0000 (+0200)
Subject: Issue #22896: Fixed using _getbuffer() in recently added _PyBytes_Format().
X-Git-Tag: v3.5.0a1~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83848704f550912fe559988d6de0b5105844d75f;p=python

Issue #22896: Fixed using _getbuffer() in recently added _PyBytes_Format().
---

diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index b2fbc92622..b2bf098409 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -622,14 +622,13 @@ _PyBytes_Format(PyObject *format, PyObject *args)
             int isnumok;
             PyObject *v = NULL;
             PyObject *temp = NULL;
-            Py_buffer buf;
+            Py_buffer buf = {NULL, NULL};
             char *pbuf;
             int sign;
             Py_ssize_t len;
             char formatbuf[FORMATBUFLEN];
                  /* For format{int,char}() */
 
-            buf.obj = NULL;
             fmt++;
             if (*fmt == '(') {
                 char *keystart;
@@ -790,7 +789,7 @@ _PyBytes_Format(PyObject *format, PyObject *args)
                     Py_DECREF(temp);
                     goto error;
                 }
-                if (_getbuffer(repr, &buf) < 0) {
+                if (PyObject_GetBuffer(repr, &buf, PyBUF_SIMPLE) != 0) {
                     temp = format_obj(repr);
                     if (temp == NULL) {
                         Py_DECREF(repr);