From f417ae8d4c9bb497868124098aeb2c260dd1964c Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Thu, 29 Jul 2010 21:47:28 +0000 Subject: [PATCH] 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. ........ ................ --- Misc/NEWS | 2 ++ Modules/_struct.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 5ce766435f9..ad25699ecb3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -322,6 +322,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 936e8af0436..b85d1063685 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1404,6 +1404,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;