mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

#3205: bz2 iterator fails silently on MemoryError

Browse source
This commit is contained in:
Antoine Pitrou 2008-08-09 17:22:25 +00:00
parent 59ce901a20
commit 016b366df4
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -12,6 +12,9 @@ What's New in Python 2.6 beta 3?
Core and Builtins 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 - Issue #1481296: Make long(float('nan')) and int(float('nan')) raise
ValueError consistently across platforms. ValueError consistently across platforms.

1
Modules/bz2module.c
View file

@ -416,6 +416,7 @@ Util_ReadAhead(BZ2FileObject *f, int bufsize)
return 0; return 0;
} }
if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) { if ((f->f_buf = PyMem_Malloc(bufsize)) == NULL) {
PyErr_NoMemory();
return -1; return -1;
} }
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS