# HG changeset patch
# Parent ca54c27a9045c655ef1ad9ce248f02eb00137476
diff -r ca54c27a9045 -r cebb1c0e4a6f Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Tue Aug 21 14:54:22 2012 +0100
+++ b/Modules/_io/fileio.c	Wed Aug 22 10:53:53 2012 +0100
@@ -631,27 +631,31 @@
 end = (Py_off_t)-1;
 #endif
 while (1) {
+ if (total < PyBytes_GET_SIZE(result)) { + newsize = PyBytes_GET_SIZE(result); + } else { #ifdef HAVE_FSTAT - newsize = new_buffersize(self, total, pos, end); + newsize = new_buffersize(self, total, pos, end); #else - newsize = new_buffersize(self, total); + newsize = new_buffersize(self, total); #endif - if (newsize> PY_SSIZE_T_MAX &#124;&#124; newsize <= 0) { - PyErr_SetString(PyExc_OverflowError, - "unbounded read returned more bytes " - "than a Python string can hold "); - Py_DECREF(result); - return NULL; - } + if (newsize> PY_SSIZE_T_MAX &#124;&#124; newsize <= 0) {
+ PyErr_SetString(PyExc_OverflowError,
+ "unbounded read returned more bytes "
+ "than a Python string can hold ");
+ Py_DECREF(result);
+ return NULL;
+ }
 
- if (PyBytes_GET_SIZE(result) < (Py_ssize_t)newsize) {
- if (_PyBytes_Resize(&result, newsize) < 0) {
- if (total == 0) {
- Py_DECREF(result);
- return NULL;
+ if (PyBytes_GET_SIZE(result) < (Py_ssize_t)newsize) {
+ if (_PyBytes_Resize(&result, newsize) < 0) {
+ if (total == 0) {
+ Py_DECREF(result);
+ return NULL;
+ }
+ PyErr_Clear();
+ break;
 }
- PyErr_Clear();
- break;
 }
 }
 Py_BEGIN_ALLOW_THREADS
</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://bugs.python.org/file26959/readall-resize.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file26959/readall-resize.patch" 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>