diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-25 10:46:04 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-25 10:46:04 +0300 |
| commit | 4a07b03673d315e0d98c5e29cc9cbeeec1d5c94f (patch) | |
| tree | 7cdc507d170dc6f879b1fde1093012f5be58fece /contrib/tools/python3/src/Modules/binascii.c | |
| parent | 86f93d737e9db0e8bfdb6d6a291b6dbdab9d1bdb (diff) | |
| download | ydb-4a07b03673d315e0d98c5e29cc9cbeeec1d5c94f.tar.gz | |
intermediate changes
ref:ac52b2b4969cd1562fcebef15e16af428f77648b
Diffstat (limited to 'contrib/tools/python3/src/Modules/binascii.c')
| -rw-r--r-- | contrib/tools/python3/src/Modules/binascii.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/contrib/tools/python3/src/Modules/binascii.c b/contrib/tools/python3/src/Modules/binascii.c index 1f3248b604..3777580a79 100644 --- a/contrib/tools/python3/src/Modules/binascii.c +++ b/contrib/tools/python3/src/Modules/binascii.c @@ -1120,16 +1120,20 @@ binascii_crc32_impl(PyObject *module, Py_buffer *data, unsigned int crc) /*[clinic end generated code: output=52cf59056a78593b input=bbe340bc99d25aa8]*/ #ifdef USE_ZLIB_CRC32 -/* This was taken from zlibmodule.c PyZlib_crc32 (but is PY_SSIZE_T_CLEAN) */ +/* The same core as zlibmodule.c zlib_crc32_impl. */ { - const Byte *buf; - Py_ssize_t len; - int signed_val; - - buf = (Byte*)data->buf; - len = data->len; - signed_val = crc32(crc, buf, len); - return (unsigned int)signed_val & 0xffffffffU; + unsigned char *buf = data->buf; + Py_ssize_t len = data->len; + + /* Avoid truncation of length for very large buffers. crc32() takes + length as an unsigned int, which may be narrower than Py_ssize_t. */ + while ((size_t)len > UINT_MAX) { + crc = crc32(crc, buf, UINT_MAX); + buf += (size_t) UINT_MAX; + len -= (size_t) UINT_MAX; + } + crc = crc32(crc, buf, (unsigned int)len); + return crc & 0xffffffff; } #else /* USE_ZLIB_CRC32 */ { /* By Jim Ahlstrom; All rights transferred to CNRI */ |