From 929af53024a809ece9978f47af48df28e2f518fa Mon Sep 17 00:00:00 2001 From: msnyder Date: Thu, 9 Aug 2007 18:37:08 +0000 Subject: [PATCH] 2007-08-09 Michael Snyder * solib.c (solib_open): Memory leak -- openp returns xmalloc buffer. --- gdb/solib.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gdb/solib.c b/gdb/solib.c index f522812d42..bd4cf51755 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -176,6 +176,17 @@ solib_open (char *in_pathname, char **found_pathname) /* Now see if we can open it. */ found_file = open (temp_pathname, O_RDONLY | O_BINARY, 0); + /* We try to find the library in various ways. After each attempt + (except for the one above), either found_file >= 0 and + temp_pathname is a malloc'd string, or found_file < 0 and + temp_pathname does not point to storage that needs to be + freed. */ + + if (found_file < 0) + temp_pathname = NULL; + else + temp_pathname = xstrdup (temp_pathname); + /* If the search in gdb_sysroot failed, and the path name is absolute at this point, make it relative. (openp will try and open the file according to its absolute path otherwise, which is not what we want.) @@ -224,8 +235,13 @@ solib_open (char *in_pathname, char **found_pathname) /* Done. If not found, tough luck. Return found_file and (optionally) found_pathname. */ - if (found_pathname != NULL && temp_pathname != NULL) - *found_pathname = xstrdup (temp_pathname); + if (temp_pathname) + { + if (found_pathname != NULL) + *found_pathname = temp_pathname; + else + xfree (temp_pathname); + } return found_file; } -- 2.11.0