diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | elf/dl-load.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 962c9b23e5..483c16091d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-05-22 Jakub Jelinek <jakub@redhat.com> + + * elf/dl-load.c (_dl_init_paths): If env_path_list has 0 elements, + free it and set to (void *) -1. + 2000-05-22 Jakub Jelinek <jakub@redhat.com> * stdio-common/vfscanf.c (__vfscanf): Remove bogus check if '-' is diff --git a/elf/dl-load.c b/elf/dl-load.c index 10698ce045..f5b2bcd031 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -636,6 +636,12 @@ _dl_init_paths (const char *llp) (void) fillin_rpath (local_strdup (llp), env_path_list, ":;", __libc_enable_secure, "LD_LIBRARY_PATH", NULL); + + if (env_path_list[0] == NULL) + { + free (env_path_list); + env_path_list = (void *) -1; + } } else env_path_list = (void *) -1; |