From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 9 Sep 2009 11:46:13 +0000 (+0000)
Subject: Merged revisions 74727 via svnmerge from
X-Git-Tag: v2.6.3rc1~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cb038678f27612dd577a1659e6b118578dc78f7;p=thirdparty%2FPython%2Fcpython.git

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

........
  r74727 | benjamin.peterson | 2009-09-08 18:04:22 -0500 (Tue, 08 Sep 2009) | 1 line

  #6865 fix ref counting in initialization of pwd module
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0f4d90ee4632..d81de7099819 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -778,6 +778,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6865: Fix reference counting issue in the initialization of the pwd
+  module.
+
 - Issue #3741: DISTUTILS_USE_SDK set causes msvc9compiler.py to raise an
   exception.
 
diff --git a/Modules/pwdmodule.c b/Modules/pwdmodule.c
index a271c5a82ebc..2865dc6bf41f 100644
--- a/Modules/pwdmodule.c
+++ b/Modules/pwdmodule.c
@@ -194,6 +194,7 @@ initpwd(void)
 	Py_INCREF((PyObject *) &StructPwdType);
 	PyModule_AddObject(m, "struct_passwd", (PyObject *) &StructPwdType);
 	/* And for b/w compatibility (this was defined by mistake): */
+        Py_INCREF((PyObject *) &StructPwdType);
 	PyModule_AddObject(m, "struct_pwent", (PyObject *) &StructPwdType);
 	initialized = 1;
 }