[Python-checkins] r60838 - in python/branches/release25-maint: Misc/NEWS Modules/arraymodule.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Feb 15 20:11:46 2008
New Revision: 60838

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/arraymodule.c
Log:
Fix deallocation of array objects when allocation ran out of memory.


Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Fri Feb 15 20:11:46 2008
@@ -4,6 +4,17 @@
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.5.2?
+=============================
+
+*Release date: XX-Feb-2008*
+
+Extension Modules
+-----------------
+
+- Fix deallocation of array objects when allocation ran out of memory.
+
+
 What's New in Python 2.5.2c1?
 =============================
 

Modified: python/branches/release25-maint/Modules/arraymodule.c
==============================================================================
--- python/branches/release25-maint/Modules/arraymodule.c	(original)
+++ python/branches/release25-maint/Modules/arraymodule.c	Fri Feb 15 20:11:46 2008
@@ -439,6 +439,7 @@
 	else {
 		op->ob_item = PyMem_NEW(char, nbytes);
 		if (op->ob_item == NULL) {
+			_Py_ForgetReference(op);
 			PyObject_Del(op);
 			return PyErr_NoMemory();
 		}