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

Fix bytes.__bytes__ to not truncate at a zero byte (GH-27902)

This commit is contained in:
Mark Dickinson 2021-08-23 15:24:12 +01:00 committed by GitHub
parent 24b63c695a
commit ae5259171b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_bytes.py
View File

@ -982,14 +982,14 @@ class BytesTest(BaseBytesTest, unittest.TestCase):
type2test = bytes
def test__bytes__(self):
foo = b'foo'
foo = b'foo\x00bar'
self.assertEqual(foo.__bytes__(), foo)
self.assertEqual(type(foo.__bytes__()), self.type2test)
class bytes_subclass(bytes):
pass
bar = bytes_subclass(b'bar')
bar = bytes_subclass(b'bar\x00foo')
self.assertEqual(bar.__bytes__(), bar)
self.assertEqual(type(bar.__bytes__()), self.type2test)

2
Objects/bytesobject.c
View File

@ -1701,7 +1701,7 @@ bytes___bytes___impl(PyBytesObject *self)
return (PyObject *)self;
}
else {
return PyBytes_FromString(self->ob_sval);
return PyBytes_FromStringAndSize(self->ob_sval, Py_SIZE(self));
}
}