[Python-checkins] r73019 - in python/branches/release30-maint: Misc/NEWS Modules/grpmodule.c Modules/pwdmodule.c
martin.v.loewis
python-checkins at python.org
Fri May 29 18:05:09 CEST 2009
Author: martin.v.loewis
Date: Fri May 29 18:05:08 2009
New Revision: 73019
Log:
Merged revisions 73018 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r73018 | martin.v.loewis | 2009-05-29 18:01:34 +0200 (Fr, 29 Mai 2009) | 9 lines
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/release30-maint/ (props changed)
python/branches/release30-maint/Misc/NEWS
python/branches/release30-maint/Modules/grpmodule.c
python/branches/release30-maint/Modules/pwdmodule.c
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS (original)
+++ python/branches/release30-maint/Misc/NEWS Fri May 29 18:05:08 2009
@@ -180,6 +180,8 @@
Extension Modules
-----------------
+- Issue #4873: Fix resource leaks in error cases of pwd and grp.
+
- Issue #6093: Fix off-by-one error in locale.strxfrm.
Build
Modified: python/branches/release30-maint/Modules/grpmodule.c
==============================================================================
--- python/branches/release30-maint/Modules/grpmodule.c (original)
+++ python/branches/release30-maint/Modules/grpmodule.c Fri May 29 18:05:08 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/release30-maint/Modules/pwdmodule.c
==============================================================================
--- python/branches/release30-maint/Modules/pwdmodule.c (original)
+++ python/branches/release30-maint/Modules/pwdmodule.c Fri May 29 18:05:08 2009
@@ -163,6 +163,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