FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

python: Fix memleak in do_start_initialization

Browse source 
While playing with valgrind, I noticed that with Python 3, the progname
variable in do_start_initialization is not being freed (concat returns a
malloc'ed string).  This patch uses unique_xmalloc_ptr to manage it.
With Python 2, we pass progname it directly to Py_SetProgramName, so it
should not be freed.  We therefore release it before passing it.

gdb/ChangeLog:

	* python/python.c (do_start_initialization): Change progname
	type to gdb::unique_xmalloc_ptr.  Release the pointer when using
	Python 2.
This commit is contained in:
Simon Marchi 2017-11-26 19:32:47 -05:00
parent 7db85adb3b
commit e8e7d10c39
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2017-11-26 Simon Marchi <simon.marchi@polymtl.ca>
* python/python.c (do_start_initialization): Change progname
type to gdb::unique_xmalloc_ptr. Release the pointer when using
Python 2.
2017-11-26 Tom Tromey <tom@tromey.com>
* common/format.h: Add include guards.

12
gdb/python/python.c
View file

@ -1658,7 +1658,6 @@ finalize_python (void *ignore)
static bool
do_start_initialization ()
{
char *progname;
#ifdef IS_PY3K
int i;
size_t progsize, count;
@ -1672,19 +1671,20 @@ do_start_initialization ()
/foo/bin/python
/foo/lib/pythonX.Y/...
This must be done before calling Py_Initialize. */
progname = concat (ldirname (python_libdir).c_str (), SLASH_STRING, "bin",
SLASH_STRING, "python", (char *) NULL);
gdb::unique_xmalloc_ptr<char> progname
(concat (ldirname (python_libdir).c_str (), SLASH_STRING, "bin",
SLASH_STRING, "python", (char *) NULL));
#ifdef IS_PY3K
std::string oldloc = setlocale (LC_ALL, NULL);
setlocale (LC_ALL, "");
progsize = strlen (progname);
progsize = strlen (progname.get ());
progname_copy = (wchar_t *) PyMem_Malloc ((progsize + 1) * sizeof (wchar_t));
if (!progname_copy)
{
fprintf (stderr, "out of memory\n");
return false;
}
count = mbstowcs (progname_copy, progname, progsize + 1);
count = mbstowcs (progname_copy, progname.get (), progsize + 1);
if (count == (size_t) -1)
{
fprintf (stderr, "Could not convert python path to string\n");
@ -1697,7 +1697,7 @@ do_start_initialization ()
it is not freed after this call. */
Py_SetProgramName (progname_copy);
#else
Py_SetProgramName (progname);
Py_SetProgramName (progname.release ());
#endif
#endif