diff options
Diffstat (limited to 'libexec/ld.so/library.c')
| -rw-r--r-- | libexec/ld.so/library.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libexec/ld.so/library.c b/libexec/ld.so/library.c index e932382de6c..a927ae1c560 100644 --- a/libexec/ld.so/library.c +++ b/libexec/ld.so/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.63 2011/11/28 20:59:03 guenther Exp $ */ +/* $OpenBSD: library.c,v 1.64 2012/01/09 17:01:22 ariane Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -181,17 +181,20 @@ _dl_tryload_shlib(const char *libname, int type, int flags) Elf_Addr size = off + phdp->p_filesz; void *res; - res = _dl_mmap(start, ROUND_PG(size), - PFLAGS(phdp->p_flags), - MAP_FIXED|MAP_PRIVATE, libfile, - TRUNC_PG(phdp->p_offset)); + if (size != 0) { + res = _dl_mmap(start, ROUND_PG(size), + PFLAGS(phdp->p_flags), + MAP_FIXED|MAP_PRIVATE, libfile, + TRUNC_PG(phdp->p_offset)); + } else + res = NULL; /* silence gcc */ next_load = _dl_malloc(sizeof(struct load_list)); next_load->next = load_list; load_list = next_load; next_load->start = start; next_load->size = size; next_load->prot = PFLAGS(phdp->p_flags); - if (_dl_mmap_error(res)) { + if (size != 0 && _dl_mmap_error(res)) { _dl_printf("%s: rtld mmap failed mapping %s.\n", _dl_progname, libname); _dl_close(libfile); |