Add trailing null bytes to a few more places.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index 75b7939..987a3c5 100644
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -138,11 +138,12 @@
if (size < alloc / 2) {
/* Major downsize; resize down to exact size */
- alloc = size;
+ alloc = size + 1;
}
else if (size < alloc) {
/* Within allocated size; quick exit */
((PyBytesObject *)self)->ob_size = size;
+ ((PyBytesObject *)self)->ob_bytes[size] = '\0'; /* Trailing null byte */
return 0;
}
else if (size <= alloc * 1.125) {
@@ -151,10 +152,8 @@
}
else {
/* Major upsize; resize up to exact size */
- alloc = size;
- }
- if (alloc <= size)
alloc = size + 1;
+ }
sval = PyMem_Realloc(((PyBytesObject *)self)->ob_bytes, alloc);
if (sval == NULL) {
@@ -165,7 +164,6 @@
((PyBytesObject *)self)->ob_bytes = sval;
((PyBytesObject *)self)->ob_size = size;
((PyBytesObject *)self)->ob_alloc = alloc;
-
((PyBytesObject *)self)->ob_bytes[size] = '\0'; /* Trailing null byte */
return 0;
@@ -231,8 +229,10 @@
size = mysize + osize;
if (size < 0)
return PyErr_NoMemory();
- if (size < self->ob_alloc)
+ if (size < self->ob_alloc) {
self->ob_size = size;
+ self->ob_bytes[self->ob_size] = '\0'; /* Trailing null byte */
+ }
else if (PyBytes_Resize((PyObject *)self, size) < 0)
return NULL;
memcpy(self->ob_bytes + mysize, optr, osize);
@@ -278,8 +278,10 @@
size = mysize * count;
if (count != 0 && size / count != mysize)
return PyErr_NoMemory();
- if (size < self->ob_alloc)
+ if (size < self->ob_alloc) {
self->ob_size = size;
+ self->ob_bytes[self->ob_size] = '\0'; /* Trailing null byte */
+ }
else if (PyBytes_Resize((PyObject *)self, size) < 0)
return NULL;
@@ -713,8 +715,10 @@
}
bytes = PyString_AS_STRING(encoded);
size = PyString_GET_SIZE(encoded);
- if (size < self->ob_alloc)
+ if (size < self->ob_alloc) {
self->ob_size = size;
+ self->ob_bytes[self->ob_size] = '\0'; /* Trailing null byte */
+ }
else if (PyBytes_Resize((PyObject *)self, size) < 0) {
Py_DECREF(encoded);
return -1;