From 106802547c0180a29a8a55640d1f5b8ae670d657 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Mon, 7 May 2012 23:50:05 +0200 Subject: Backout ab500b297900: the check for integer overflow is wrong Issue #14716: Change integer overflow check in unicode_writer_prepare() to compute the limit at compile time instead of runtime. Patch writen by Serhiy Storchaka. --- Objects/unicodeobject.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4bbaa35..0722312 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13242,10 +13242,8 @@ unicode_writer_prepare(unicode_writer_t *writer, newlen = writer->pos + length; if (newlen > PyUnicode_GET_LENGTH(writer->buffer)) { - /* Overallocate 25% to limit the number of resize. - Check for integer overflow: - (newlen + newlen / 4) <= PY_SSIZE_T_MAX */ - if (newlen <= (PY_SSIZE_T_MAX - PY_SSIZE_T_MAX / 5)) + /* overallocate 25% to limit the number of resize */ + if (newlen <= (PY_SSIZE_T_MAX - newlen / 4)) newlen += newlen / 4; if (maxchar > writer->maxchar) { -- cgit v0.12