commit f417ae8d4c9bb497868124098aeb2c260dd1964c
author Mark Dickinson <dickinsm@gmail.com> Thu Jul 29 21:47:28 2010 +0000
committer Mark Dickinson <dickinsm@gmail.com> Thu Jul 29 21:47:28 2010 +0000
tree 37720c901030e99b31d8a22f9fcd91475bbff521
parent 8243ddb6ca5c0f78764a28f044f0c0284774d317

Merged revisions 83241 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83241 | mark.dickinson | 2010-07-29 22:44:47 +0100 (Thu, 29 Jul 2010) | 9 lines

  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.
  ........
................

Modules/_struct.c

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 936e8af..b85d106 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -1404,6 +1404,9 @@
         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;