merge from gcc
This commit is contained in:
parent
b8deab3780
commit
9250f7f0d2
2 changed files with 13 additions and 2 deletions
|
@ -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.
|
||||
|
|
|
@ -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--;
|
||||
|
||||
|
|
Loading…
Reference in a new issue