diff options
| author | DJ Delorie <dj@redhat.com> | 2008-03-24 18:06:37 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2008-03-24 18:06:37 +0000 |
| commit | daddbc6edd327f44cc7093696f487c4a9e689132 (patch) | |
| tree | 1b1cc1cf469478623d48b9faf7bfb94f9e5c5276 /libiberty | |
| parent | c5b48eacfa0f8cade0bf4a11729509e833bcff63 (diff) | |
| download | gdb-daddbc6edd327f44cc7093696f487c4a9e689132.zip gdb-daddbc6edd327f44cc7093696f487c4a9e689132.tar.gz gdb-daddbc6edd327f44cc7093696f487c4a9e689132.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/make-relative-prefix.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index fad27c3..547007a 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -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> * cplus-dem.c (malloc, realloc): Use void * instead of char * diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c index 80e7f92..c98d287 100644 --- a/libiberty/make-relative-prefix.c +++ b/libiberty/make-relative-prefix.c @@ -292,14 +292,12 @@ make_relative_prefix_1 (const char *progname, const char *bin_prefix, } } - if ( resolve_links ) - { - full_progname = lrealpath (progname); - if (full_progname == NULL) - return NULL; - } + if (resolve_links) + full_progname = lrealpath (progname); else - full_progname = strdup(progname); + full_progname = strdup (progname); + if (full_progname == NULL) + return NULL; prog_dirs = split_directories (full_progname, &prog_num); free (full_progname); |