Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

Add also tests for PyUnicode_FromFormat() and PyBytes_FromFormat()
with empty result.
This commit is contained in:
Serhiy Storchaka 2019-01-12 09:22:29 +02:00 committed by GitHub
parent d0d3e99120
commit 44cc4822bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/test/test_bytes.py
View File

@ -1001,6 +1001,12 @@ class BytesTest(BaseBytesTest, unittest.TestCase):
self.assertRaises(OverflowError,
PyBytes_FromFormat, b'%c', c_int(256))
# Issue #33817: empty strings
self.assertEqual(PyBytes_FromFormat(b''),
b'')
self.assertEqual(PyBytes_FromFormat(b'%s', b''),
b'')
def test_bytes_blocking(self):
class IterationBlocked(list):
__bytes__ = None

6
Lib/test/test_unicode.py
View File

@ -2680,6 +2680,12 @@ class CAPITest(unittest.TestCase):
check_format('%.%s',
b'%.%s', b'abc')
# Issue #33817: empty strings
check_format('',
b'')
check_format('',
b'%s', b'')
# Test PyUnicode_AsWideChar()
@support.cpython_only
def test_aswidechar(self):

1
Misc/NEWS.d/next/C API/2019-01-11-11-16-16.bpo-33817.nJ4yIj.rst Normal file
View File

@ -0,0 +1 @@
Fixed :c:func:`_PyBytes_Resize` for empty bytes objects.

13
Objects/bytesobject.c
View File

@ -2991,9 +2991,22 @@ _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
/* return early if newsize equals to v->ob_size */
return 0;
}
if (Py_SIZE(v) == 0) {
if (newsize == 0) {
return 0;
}
*pv = _PyBytes_FromSize(newsize, 0);
Py_DECREF(v);
return (*pv == NULL) ? -1 : 0;
}
if (Py_REFCNT(v) != 1) {
goto error;
}
if (newsize == 0) {
*pv = _PyBytes_FromSize(0, 0);
Py_DECREF(v);
return (*pv == NULL) ? -1 : 0;
}
/* XXX UNREF/NEWREF interface should be more symmetrical */
_Py_DEC_REFTOTAL;
_Py_ForgetReference(v);