mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-17 05:43:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge #14398: Fix size truncation and overflow bugs in bz2 module.

Browse Source
This commit is contained in:
Nadeem Vawda 2012-10-21 21:19:11 +02:00
commit 78a59a6a57
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -59,6 +59,8 @@ Core and Builtins
Library Library
------- -------
- Issue #14398: Fix size truncation and overflow bugs in the bz2 module.
- Issue #12692: Fix resource leak in urllib.request when talking to an HTTP - Issue #12692: Fix resource leak in urllib.request when talking to an HTTP
server that does not include a "Connection: close" header in its responses. server that does not include a "Connection: close" header in its responses.

33
Modules/_bz2module.c
View File

@ -123,7 +123,14 @@ grow_buffer(PyObject **buf)
giving us amortized linear-time behavior. Use a less-than-double giving us amortized linear-time behavior. Use a less-than-double
growth factor to avoid excessive allocation. */ growth factor to avoid excessive allocation. */
size_t size = PyBytes_GET_SIZE(*buf); size_t size = PyBytes_GET_SIZE(*buf);
return _PyBytes_Resize(buf, size + (size >> 3) + 6); size_t new_size = size + (size >> 3) + 6;
if (new_size > size) {
return _PyBytes_Resize(buf, new_size);
} else { /* overflow */
PyErr_SetString(PyExc_OverflowError,
"Unable to allocate buffer - output too large");
return -1;
}
} }
@ -169,10 +176,14 @@ compress(BZ2Compressor *c, char *data, size_t len, int action)
break; break;
if (c->bzs.avail_out == 0) { if (c->bzs.avail_out == 0) {
if (grow_buffer(&result) < 0) size_t buffer_left = PyBytes_GET_SIZE(result) - data_size;
goto error; if (buffer_left == 0) {
c->bzs.next_out = PyBytes_AS_STRING(result) + data_size; if (grow_buffer(&result) < 0)
c->bzs.avail_out = PyBytes_GET_SIZE(result) - data_size; goto error;
c->bzs.next_out = PyBytes_AS_STRING(result) + data_size;
buffer_left = PyBytes_GET_SIZE(result) - data_size;
}
c->bzs.avail_out = MIN(buffer_left, UINT_MAX);
} }
} }
if (data_size != PyBytes_GET_SIZE(result)) if (data_size != PyBytes_GET_SIZE(result))
@ -390,10 +401,14 @@ decompress(BZ2Decompressor *d, char *data, size_t len)
len -= d->bzs.avail_in; len -= d->bzs.avail_in;
} }
if (d->bzs.avail_out == 0) { if (d->bzs.avail_out == 0) {
if (grow_buffer(&result) < 0) size_t buffer_left = PyBytes_GET_SIZE(result) - data_size;
goto error; if (buffer_left == 0) {
d->bzs.next_out = PyBytes_AS_STRING(result) + data_size; if (grow_buffer(&result) < 0)
d->bzs.avail_out = PyBytes_GET_SIZE(result) - data_size; goto error;
d->bzs.next_out = PyBytes_AS_STRING(result) + data_size;
buffer_left = PyBytes_GET_SIZE(result) - data_size;
}
d->bzs.avail_out = MIN(buffer_left, UINT_MAX);
} }
} }
if (data_size != PyBytes_GET_SIZE(result)) if (data_size != PyBytes_GET_SIZE(result))