d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The function make_relative_prefix_1 does not properly free locally

Browse Source 
allocated memory when it returns early.

Free the memory associated with the variables full_programe, bin_dirs,
prog_dirs, and prefix_dirs when the function returns early.

Submitted by:	Tom Rix <trix@juniper.net>
Reviewed by:	jhibbits, emaste
Approved by:	sjg (mentor)
Obtained from:	Juniper Networks, Inc.
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D9691
This commit is contained in:
Stephen J. Kiernan 2017-12-06 21:18:45 +00:00
parent 8b17691466
commit b32f189046
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/binutils/libiberty/make-relative-prefix.c
View File

@ -299,10 +299,18 @@ 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);
if (prog_dirs == NULL)
{
free (full_progname);
return NULL;
}
free (full_progname);
if (bin_dirs == NULL || 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--;
@ -365,7 +373,12 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
ret = (char *) malloc (needed_len);
if (ret == NULL)
return NULL;
{
free_split_directories (prog_dirs);
free_split_directories (bin_dirs);
free_split_directories (prefix_dirs);
return NULL;
}
/* Build up the pathnames in argv[0]. */
*ret = '\0';