diff options
author | DJ Delorie <dj@delorie.com> | 2007-08-03 19:49:44 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2007-08-03 19:49:44 +0000 |
commit | 6e5946a220b4c95764fe5f3aa11e2c73e288fccc (patch) | |
tree | 5c3a539a0a9359564a1d99916c5e58f088ec9df2 /libiberty | |
parent | 57861f06a0a3ca24e7523f1b7df782a9137c71a5 (diff) | |
download | gdb-6e5946a220b4c95764fe5f3aa11e2c73e288fccc.tar.gz |
merge from gcc
Diffstat (limited to 'libiberty')
-rw-r--r-- | libiberty/ChangeLog | 5 | ||||
-rw-r--r-- | libiberty/make-relative-prefix.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index aee3cc76f57..28e2c4fab3a 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2007-08-03 Michael Snyder <msnyder@access-company.com> + + * make-relative-prefix.c (make_relative_prefix_1): Fix resource + leak. + 2007-07-31 Michael Snyder <msnyder@access-company.com> * cp-demangle.c (d_print_comp): Guard against null. diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c index 037809e34ed..be61040e18c 100644 --- a/libiberty/make-relative-prefix.c +++ b/libiberty/make-relative-prefix.c @@ -299,11 +299,17 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix, full_progname = strdup(progname); prog_dirs = split_directories (full_progname, &prog_num); - bin_dirs = split_directories (bin_prefix, &bin_num); free (full_progname); - if (bin_dirs == NULL || prog_dirs == NULL) + if (prog_dirs == NULL) return NULL; + bin_dirs = split_directories (bin_prefix, &bin_num); + if (bin_dirs == NULL) + { + free_split_directories (prog_dirs); + return NULL; + } + /* Remove the program name from comparison of directory names. */ prog_num--; |