Fixing bug #407504. -- did not close pwd/grp databases.

diff --git a/Misc/NEWS b/Misc/NEWS
index c20900f825c0b511e242d96b6fda1e44644f98d4..25638538893b5b9359d5a705c9f25d31a2a49689 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,10 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=<id>&group_id=5470&atid
 - complex() could segfault on numeric types with NULL for float conversion.
   Fixed.
 
+- Fixed #407504 -- closing pwd and grp database when finished.
+
+- Fixed memory leak in from import ...
+
 
 What's New in Python 2.0?
 =========================

diff --git a/Modules/grpmodule.c b/Modules/grpmodule.c
index 41a5ec975735c61883215ece711874db59ac1404..5dbcf9862bc8f49f2b52fceb420693f6d37826be 100644 (file)
--- a/Modules/grpmodule.c
+++ b/Modules/grpmodule.c
@@ -87,6 +87,7 @@ grp_getgrall(PyObject *self, PyObject *args)
         }
         Py_DECREF(v);
     }
+    endgrent();
     return d;
 }
 

diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index 290dc45145592ba2dc003c24e47d362e29e39cbb..4c1b7db87892cf57044b40de3e0fbbb0a70fdd88 100644 (file)
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -102,6 +102,7 @@ pwd_getpwall(PyObject *self, PyObject *args)
                }
                Py_DECREF(v);
        }
+       endpwent();
        return d;
 }
 #endif