Fix memory leak in python.c:do_start_initialization

When intializing Python the path to the python binary is build the
following way

progname = concat (ldirname (python_libdir), SLASH_STRING, "bin",
		   SLASH_STRING, "python", (char *) NULL);

This is problematic as both concat and ldirname allocate memory for the
string they return.  Thus the memory allocated by ldirname cannot be
accessed afterwards causing a memory leak.  Fix it by temporarily storing
libdir in a variable and xfree it after concat.

gdb/ChangeLog:
	python/python.c (do_start_initialization): Fix memory leak.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8bb9e21258c2f3c3039042d1701086b5fa1a2ca6..f69a27e71f18da93b0326e646cecd9986cefeb07 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-23  Philipp Rudo  <prudo@linux.vnet.ibm.com>
+
+       python/python.c (do_start_initialization): Fix memory leak.
+
 2017-03-22  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * inf-ptrace.c (inf_ptrace_xfer_partial): Get pid from ptid

diff --git a/gdb/python/python.c b/gdb/python/python.c
index 73fb3d029516f341e5aa71d1cd218aac43f617b2..d814252303d831c25987586a7b59ed0f210992c4 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -1550,8 +1550,10 @@ do_start_initialization ()
      /foo/bin/python
      /foo/lib/pythonX.Y/...
      This must be done before calling Py_Initialize.  */
-  progname = concat (ldirname (python_libdir), SLASH_STRING, "bin",
+  const char *libdir = ldirname (python_libdir);
+  progname = concat (libdir, SLASH_STRING, "bin",
                     SLASH_STRING, "python", (char *) NULL);
+  xfree (libdir);
 #ifdef IS_PY3K
   oldloc = xstrdup (setlocale (LC_ALL, NULL));
   setlocale (LC_ALL, "");