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

mdickinson · web-flow · commit ae5259171b8e · 2021-08-23T15:24:12.000+01:00
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
@@ -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)
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -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));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1701,7 +1701,7 @@ bytes___bytes___impl(PyBytesObject *self)`
`1701`	`1701`	`return (PyObject *)self;`
`1702`	`1702`	`}`
`1703`	`1703`	`else {`
`1704`		`- return PyBytes_FromString(self->ob_sval);`
	`1704`	`+ return PyBytes_FromStringAndSize(self->ob_sval, Py_SIZE(self));`
`1705`	`1705`	`}`
`1706`	`1706`	`}`
`1707`	`1707`