sthagen
diff --git a/‎Objects/codeobject.c‎
Lines changed: 8 additions & 12 deletions b/‎Objects/codeobject.c‎
Lines changed: 8 additions & 12 deletions
@@ -647,19 +647,19 @@ remove_column_info(PyObject *locations)
 {
     Py_ssize_t offset = 0;
     const uint8_t *data = (const uint8_t *)PyBytes_AS_STRING(locations);
-    PyObject *res = PyBytes_FromStringAndSize(NULL, 32);
+    PyBytesWriter *res = PyBytesWriter_Create(32);
     if (res == NULL) {
-        PyErr_NoMemory();
         return NULL;
     }
-    uint8_t *output = (uint8_t *)PyBytes_AS_STRING(res);
+    uint8_t *output = (uint8_t *)PyBytesWriter_GetData(res);
     while (offset < PyBytes_GET_SIZE(locations)) {
-        Py_ssize_t write_offset = output - (uint8_t *)PyBytes_AS_STRING(res);
-        if (write_offset + 16 >= PyBytes_GET_SIZE(res)) {
-            if (_PyBytes_Resize(&res, PyBytes_GET_SIZE(res) * 2) < 0) {
+        Py_ssize_t write_offset = output - (uint8_t *)PyBytesWriter_GetData(res);
+        if (write_offset + 16 >= PyBytesWriter_GetSize(res)) {
+            if (PyBytesWriter_Resize(res, PyBytesWriter_GetSize(res) * 2) < 0) {
+                PyBytesWriter_Discard(res);
                 return NULL;
             }
-            output = (uint8_t *)PyBytes_AS_STRING(res) + write_offset;
+            output = (uint8_t *)PyBytesWriter_GetData(res) + write_offset;
         }
         int code = (data[offset] >> 3) & 15;
         if (code == PY_CODE_LOCATION_INFO_NONE) {
@@ -678,11 +678,7 @@ remove_column_info(PyObject *locations)
             offset++;
         }
     }
-    Py_ssize_t write_offset = output - (uint8_t *)PyBytes_AS_STRING(res);
-    if (_PyBytes_Resize(&res, write_offset)) {
-        return NULL;
-    }
-    return res;
+    return PyBytesWriter_FinishWithPointer(res, output);
 }
 
 static int
Original file line number	Diff line number	Diff line change
`@@ -647,19 +647,19 @@ remove_column_info(PyObject *locations)`
`647`	`647`	`{`
`648`	`648`	`Py_ssize_t offset = 0;`
`649`	`649`	`const uint8_t data = (const uint8_t )PyBytes_AS_STRING(locations);`
`650`		`- PyObject *res = PyBytes_FromStringAndSize(NULL, 32);`
	`650`	`+ PyBytesWriter *res = PyBytesWriter_Create(32);`
`651`	`651`	`if (res == NULL) {`
`652`		`- PyErr_NoMemory();`
`653`	`652`	`return NULL;`
`654`	`653`	`}`
`655`		`- uint8_t output = (uint8_t )PyBytes_AS_STRING(res);`
	`654`	`+ uint8_t output = (uint8_t )PyBytesWriter_GetData(res);`
`656`	`655`	`while (offset < PyBytes_GET_SIZE(locations)) {`
`657`		`- Py_ssize_t write_offset = output - (uint8_t *)PyBytes_AS_STRING(res);`
`658`		`- if (write_offset + 16 >= PyBytes_GET_SIZE(res)) {`
`659`		`- if (_PyBytes_Resize(&res, PyBytes_GET_SIZE(res) * 2) < 0) {`
	`656`	`+ Py_ssize_t write_offset = output - (uint8_t *)PyBytesWriter_GetData(res);`
	`657`	`+ if (write_offset + 16 >= PyBytesWriter_GetSize(res)) {`
	`658`	`+ if (PyBytesWriter_Resize(res, PyBytesWriter_GetSize(res) * 2) < 0) {`
	`659`	`+ PyBytesWriter_Discard(res);`
`660`	`660`	`return NULL;`
`661`	`661`	`}`
`662`		`- output = (uint8_t *)PyBytes_AS_STRING(res) + write_offset;`
	`662`	`+ output = (uint8_t *)PyBytesWriter_GetData(res) + write_offset;`
`663`	`663`	`}`
`664`	`664`	`int code = (data[offset] >> 3) & 15;`
`665`	`665`	`if (code == PY_CODE_LOCATION_INFO_NONE) {`
`@@ -678,11 +678,7 @@ remove_column_info(PyObject *locations)`
`678`	`678`	`offset++;`
`679`	`679`	`}`
`680`	`680`	`}`
`681`		`- Py_ssize_t write_offset = output - (uint8_t *)PyBytes_AS_STRING(res);`
`682`		`- if (_PyBytes_Resize(&res, write_offset)) {`
`683`		`- return NULL;`
`684`		`- }`
`685`		`- return res;`
	`681`	`+ return PyBytesWriter_FinishWithPointer(res, output);`
`686`	`682`	`}`
`687`	`683`
`688`	`684`	`static int`