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.
........
This commit is contained in:
Mark Dickinson 2010-07-29 21:43:24 +00:00
parent 8a550f3149
commit 2da63cc338
2 changed files with 5 additions and 0 deletions

View File

@ -323,6 +323,8 @@ Library
Extension Modules 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 - Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly
compared to other unix systems. In particular, os.getgroups() does compared to other unix systems. In particular, os.getgroups() does
not reflect any changes made using os.setgroups() but basicly always not reflect any changes made using os.setgroups() but basicly always

View File

@ -1233,6 +1233,9 @@ prepare_s(PyStructObject *self)
PyErr_NoMemory(); PyErr_NoMemory();
return -1; 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; self->s_codes = codes;
s = fmt; s = fmt;