From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 9 Aug 2008 17:22:25 +0000 (+0000)
Subject: #3205: bz2 iterator fails silently on MemoryError
X-Git-Tag: v2.6b3~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=016b366df4c8c3fc25f103fadb613fc5254b9f88;p=thirdparty%2FPython%2Fcpython.git

#3205: bz2 iterator fails silently on MemoryError
---

diff --git a/Misc/NEWS b/Misc/NEWS
index cabee7f6de26..c6c401f5e46c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6 beta 3?
 Core and Builtins
 -----------------
 
+- Issue #3205: When iterating over a BZ2File fails allocating memory, raise
+  a MemoryError rather than silently stop the iteration.
+
 - Issue #1481296: Make long(float('nan')) and int(float('nan')) raise
   ValueError consistently across platforms.
 
diff --git a/Modules/bz2module.c b/Modules/bz2module.c
index 16201bd6486c..39292197d8ed 100644
--- a/Modules/bz2module.c
+++ b/Modules/bz2module.c
@@ -416,6 +416,7 @@ Util_ReadAhead(BZ2FileObject *f, int bufsize)
 		return 0;
 	}
 	if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) {
+		PyErr_NoMemory();
 		return -1;
 	}
 	Py_BEGIN_ALLOW_THREADS