[Python-checkins] r43506 - python/trunk/Objects/fileobject.c

Fri Mar 31 22:31:03 CEST 2006

Author: georg.brandl
Date: Fri Mar 31 22:31:02 2006
New Revision: 43506
Modified:
 python/trunk/Objects/fileobject.c
Log:
Bug #1177964: make file iterator raise MemoryError on too big files
Modified: python/trunk/Objects/fileobject.c
==============================================================================

--- python/trunk/Objects/fileobject.c	(original)
+++ python/trunk/Objects/fileobject.c	Fri Mar 31 22:31:02 2006
@@ -1797,7 +1797,7 @@
 
 /* Make sure that file has a readahead buffer with at least one byte
 (unless at EOF) and no more than bufsize. Returns negative value on
- error */
+ error, will set MemoryError if bufsize bytes cannot be allocated. */
 static int
 readahead(PyFileObject *f, int bufsize)
 {
@@ -1810,6 +1810,7 @@
 			drop_readahead(f);
 	}
 	if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) {
+		PyErr_NoMemory();
 		return -1;
 	}
 	Py_BEGIN_ALLOW_THREADS
