summaryrefslogtreecommitdiff
path: root/Modules/_struct.c
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-07-29 21:44:47 +0000
committerMark Dickinson <dickinsm@gmail.com>2010-07-29 21:44:47 +0000
commit96527c3b59a957de9b255f95f0ab73b04a124d8c (patch)
tree46cb958c9ae4bb8ff8afeaed14be5bc77c45fbd4 /Modules/_struct.c
parent0969c67bf5fd53e54e230cee99518bcd0988b657 (diff)
downloadcpython-git-96527c3b59a957de9b255f95f0ab73b04a124d8c.tar.gz
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. ........
Diffstat (limited to 'Modules/_struct.c')
-rw-r--r--Modules/_struct.c3
1 files changed, 3 insertions, 0 deletions
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;