Commit44cc482

authored

bpo-33817: Fix _PyBytes_Resize() for empty bytes object. (GH-11516)

Add also tests for PyUnicode_FromFormat() and PyBytes_FromFormat()with empty result.

1 parentd0d3e99 commit44cc482Copy full SHA for 44cc482

File tree

+26

-0

lines changed

+26

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1001,6 +1001,12 @@ def ptr_formatter(ptr):`
`1001`	`1001`	`self.assertRaises(OverflowError,`
`1002`	`1002`	`PyBytes_FromFormat,b'%c',c_int(256))`
`1003`	`1003`
	`1004`	`+# Issue #33817: empty strings`
	`1005`	`+self.assertEqual(PyBytes_FromFormat(b''),`
	`1006`	`+b'')`
	`1007`	`+self.assertEqual(PyBytes_FromFormat(b'%s',b''),`
	`1008`	`+b'')`
	`1009`	`+`
`1004`	`1010`	`deftest_bytes_blocking(self):`
`1005`	`1011`	`classIterationBlocked(list):`
`1006`	`1012`	`__bytes__=None`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2680,6 +2680,12 @@ def check_format(expected, format, *args):`
`2680`	`2680`	`check_format('%.%s',`
`2681`	`2681`	`b'%.%s',b'abc')`
`2682`	`2682`
	`2683`	`+# Issue #33817: empty strings`
	`2684`	`+check_format('',`
	`2685`	`+b'')`
	`2686`	`+check_format('',`
	`2687`	`+b'%s',b'')`
	`2688`	`+`
`2683`	`2689`	`# Test PyUnicode_AsWideChar()`
`2684`	`2690`	`@support.cpython_only`
`2685`	`2691`	`deftest_aswidechar(self):`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed:c:func:`_PyBytes_Resize` for empty bytes objects.

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2991,9 +2991,22 @@ _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)`
`2991`	`2991`	`/* return early if newsize equals to v->ob_size */`
`2992`	`2992`	`return0;`
`2993`	`2993`	`}`
	`2994`	`+if (Py_SIZE(v)==0) {`
	`2995`	`+if (newsize==0) {`
	`2996`	`+return0;`
	`2997`	`+ }`
	`2998`	`+*pv=_PyBytes_FromSize(newsize,0);`
	`2999`	`+Py_DECREF(v);`
	`3000`	`+return (*pv==NULL) ?-1 :0;`
	`3001`	`+ }`
`2994`	`3002`	`if (Py_REFCNT(v)!=1) {`
`2995`	`3003`	`gotoerror;`
`2996`	`3004`	`}`
	`3005`	`+if (newsize==0) {`
	`3006`	`+*pv=_PyBytes_FromSize(0,0);`
	`3007`	`+Py_DECREF(v);`
	`3008`	`+return (*pv==NULL) ?-1 :0;`
	`3009`	`+ }`
`2997`	`3010`	`/* XXX UNREF/NEWREF interface should be more symmetrical */`
`2998`	`3011`	`_Py_DEC_REFTOTAL;`
`2999`	`3012`	`_Py_ForgetReference(v);`

Comments

(0)