@@ -2171,7 +2171,6 @@ ndarray_tobytes(PyObject *self, PyObject *dummy)
21712171 Py_buffer * src = & ndbuf -> base ;
21722172 Py_buffer dest ;
21732173 PyObject * ret = NULL ;
2174- char * mem ;
21752174
21762175 if (ND_C_CONTIGUOUS (ndbuf -> flags ))
21772176 return PyBytes_FromStringAndSize (src -> buf , src -> len );
@@ -2180,26 +2179,26 @@ ndarray_tobytes(PyObject *self, PyObject *dummy)
21802179 assert (src -> strides != NULL );
21812180 assert (src -> ndim > 0 );
21822181
2183- mem = PyMem_Malloc (src -> len );
2184- if (mem == NULL ) {
2185- PyErr_NoMemory ();
2182+ PyBytesWriter * writer = PyBytesWriter_Create (src -> len );
2183+ if (writer == NULL ) {
21862184 return NULL ;
21872185 }
21882186
21892187 dest = * src ;
2190- dest .buf = mem ;
2188+ dest .buf = PyBytesWriter_GetData ( writer ) ;
21912189 dest .suboffsets = NULL ;
21922190 dest .strides = strides_from_shape (ndbuf , 0 );
21932191 if (dest .strides == NULL )
21942192 goto out ;
21952193 if (copy_buffer (& dest , src ) < 0 )
21962194 goto out ;
21972195
2198- ret = PyBytes_FromStringAndSize (mem , src -> len );
2196+ ret = PyBytesWriter_Finish (writer );
2197+ writer = NULL ;
21992198
22002199out :
22012200 PyMem_XFree (dest .strides );
2202- PyMem_Free ( mem );
2201+ PyBytesWriter_Discard ( writer );
22032202 return ret ;
22042203}
22052204
@@ -2445,7 +2444,7 @@ py_buffer_to_contiguous(PyObject *self, PyObject *args)
24452444 int flags ;
24462445 char ord ;
24472446 Py_buffer view ;
2448- char * buf = NULL ;
2447+ PyBytesWriter * writer = NULL ;
24492448
24502449 if (!PyArg_ParseTuple (args , "OOi" , & obj , & order , & flags )) {
24512450 return NULL ;
@@ -2460,21 +2459,21 @@ py_buffer_to_contiguous(PyObject *self, PyObject *args)
24602459 goto out ;
24612460 }
24622461
2463- buf = PyMem_Malloc (view .len );
2464- if (buf == NULL ) {
2465- PyErr_NoMemory ();
2462+ writer = PyBytesWriter_Create (view .len );
2463+ if (writer == NULL ) {
24662464 goto out ;
24672465 }
24682466
2469- if (PyBuffer_ToContiguous (buf , & view , view .len , ord ) < 0 ) {
2467+ if (PyBuffer_ToContiguous (PyBytesWriter_GetData ( writer ) , & view , view .len , ord ) < 0 ) {
24702468 goto out ;
24712469 }
24722470
2473- ret = PyBytes_FromStringAndSize (buf , view .len );
2471+ ret = PyBytesWriter_Finish (writer );
2472+ writer = NULL ;
24742473
24752474out :
24762475 PyBuffer_Release (& view );
2477- PyMem_XFree ( buf );
2476+ PyBytesWriter_Discard ( writer );
24782477 return ret ;
24792478}
24802479
0 commit comments