Merged revisions 83239 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83239 | mark.dickinson | 2010-07-29 22:41:59 +0100 (Thu, 29 Jul 2010) | 2 lines

  Issue #9422:  Fix memory leak when re-initializing a struct.Struct object.
........

2 files changed, 5 insertions, 0 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index 09cfe3c0c1..40b918b830 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,8 @@ Library
 Extension Modules
 -----------------
 
+- Issue #9422: Fix memory leak when re-initializing a struct.Struct object.
+
 - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly
   compared to other unix systems. In particular, os.getgroups() does
   not reflect any changes made using os.setgroups() but basicly always
diff --git a/Modules/_struct.c b/Modules/_struct.c
index f22c31cd2a..71e71dd0e2 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1289,6 +1289,9 @@ prepare_s(PyStructObject *self)
         PyErr_NoMemory();
         return -1;
     }
+    /* Free any s_codes value left over from a previous initialization. */
+    if (self->s_codes != NULL)
+        PyMem_FREE(self->s_codes);
     self->s_codes = codes;
 
     s = fmt;