merge from gcc
This commit is contained in:
parent
c5b48eacfa
commit
daddbc6edd
@ -1,3 +1,8 @@
|
|||||||
|
2008-03-24 Doug Evans <dje@google.com>
|
||||||
|
|
||||||
|
* make-relative-prefix.c (make_relative_prefix_1): Handle NULL
|
||||||
|
return from strdup.
|
||||||
|
|
||||||
2008-03-12 Seongbae Park <seongbae.park@gmail.com>
|
2008-03-12 Seongbae Park <seongbae.park@gmail.com>
|
||||||
|
|
||||||
* cplus-dem.c (malloc, realloc): Use void * instead of char *
|
* cplus-dem.c (malloc, realloc): Use void * instead of char *
|
||||||
|
@ -292,14 +292,12 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( resolve_links )
|
if (resolve_links)
|
||||||
{
|
full_progname = lrealpath (progname);
|
||||||
full_progname = lrealpath (progname);
|
|
||||||
if (full_progname == NULL)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
full_progname = strdup(progname);
|
full_progname = strdup (progname);
|
||||||
|
if (full_progname == NULL)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
prog_dirs = split_directories (full_progname, &prog_num);
|
prog_dirs = split_directories (full_progname, &prog_num);
|
||||||
free (full_progname);
|
free (full_progname);
|
||||||
|
Loading…
Reference in New Issue
Block a user