changeset: 76829:01581e8b50f2
user: Victor Stinner <victor.stinner@gmail.com>
date: Mon May 07 23:50:05 2012 +0200
files: Objects/unicodeobject.c
description:
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.
diff -r dbfacec7e368 -r 01581e8b50f2 Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Mon May 07 22:36:43 2012 +0100
+++ b/Objects/unicodeobject.c	Mon May 07 23:50:05 2012 +0200
@@ -13242,10 +13242,8 @@
 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) {
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/01581e8b50f2">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/01581e8b50f2" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>