[Python-checkins] r73017 - in python/branches/release26-maint: Misc/NEWS Modules/grpmodule.c Modules/pwdmodule.c

martin.v.loewis python-checkins at python.org
Fri May 29 18:00:23 CEST 2009


Author: martin.v.loewis
Date: Fri May 29 18:00:23 2009
New Revision: 73017

Log:
Merged revisions 73016 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73016 | martin.v.loewis | 2009-05-29 17:58:08 +0200 (Fr, 29 Mai 2009) | 2 lines
  
  Issue #4873: Fix resource leaks in error cases of pwd and grp.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/grpmodule.c
   python/branches/release26-maint/Modules/pwdmodule.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Fri May 29 18:00:23 2009
@@ -108,6 +108,11 @@
   makeunicodedata.py and regenerated the Unicode database (This fixes
   u'\u1d79'.lower() == '\x00').
 
+Extension Modules
+-----------------
+
+- Issue #4873: Fix resource leaks in error cases of pwd and grp.
+
 Build
 -----
 

Modified: python/branches/release26-maint/Modules/grpmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/grpmodule.c	(original)
+++ python/branches/release26-maint/Modules/grpmodule.c	Fri May 29 18:00:23 2009
@@ -76,7 +76,6 @@
 
     if (PyErr_Occurred()) {
         Py_DECREF(v);
-        Py_DECREF(w);
         return NULL;
     }
 
@@ -139,6 +138,7 @@
         if (v == NULL || PyList_Append(d, v) != 0) {
             Py_XDECREF(v);
             Py_DECREF(d);
+            endgrent();
             return NULL;
         }
         Py_DECREF(v);

Modified: python/branches/release26-maint/Modules/pwdmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/pwdmodule.c	(original)
+++ python/branches/release26-maint/Modules/pwdmodule.c	Fri May 29 18:00:23 2009
@@ -160,6 +160,7 @@
 		if (v == NULL || PyList_Append(d, v) != 0) {
 			Py_XDECREF(v);
 			Py_DECREF(d);
+			endpwent();
 			return NULL;
 		}
 		Py_DECREF(v);


More information about the Python-checkins mailing list