diff options
| author | junyoung <junyoung@NetBSD.org> | 2002-10-05 15:04:49 +0000 |
|---|---|---|
| committer | junyoung <junyoung@NetBSD.org> | 2002-10-05 15:04:49 +0000 |
| commit | 89342b95bbba8be9d9bf53448d30db4137f8f8d3 (patch) | |
| tree | 9b82a848648bae1d12b06d032b7c6eac119750b7 /libexec | |
| parent | c56045bf1afe369ae119b655c42fc4cbc47c2df8 (diff) | |
Don't call _rtld_process_mapping() with null string.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ld.elf_so/Makefile | 4 | ||||
| -rw-r--r-- | libexec/ld.elf_so/paths.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile index 05e9acbb333..48ab78ab5c1 100644 --- a/libexec/ld.elf_so/Makefile +++ b/libexec/ld.elf_so/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2002/09/27 21:37:50 thorpej Exp $ +# $NetBSD: Makefile,v 1.58 2002/10/05 15:04:49 junyoung Exp $ .include <bsd.own.mk> # for OBJECT_FMT definition .include <bsd.shlib.mk> # for SHLINKINSTALLDIR definition @@ -39,7 +39,7 @@ CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\" CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -DRTLD_LOADER CPPFLAGS+= -D_RTLD_SOURCE -#CPPFLAGS+= -DDEBUG +CPPFLAGS+= -DDEBUG #CPPFLAGS+= -DRTLD_DEBUG #CPPFLAGS+= -DRTLD_DEBUG_RELOC #DBG= -g diff --git a/libexec/ld.elf_so/paths.c b/libexec/ld.elf_so/paths.c index 58a03b175fc..1dfe35b9f40 100644 --- a/libexec/ld.elf_so/paths.c +++ b/libexec/ld.elf_so/paths.c @@ -1,4 +1,4 @@ -/* $NetBSD: paths.c,v 1.20 2002/10/05 12:23:39 mycroft Exp $ */ +/* $NetBSD: paths.c,v 1.21 2002/10/05 15:04:49 junyoung Exp $ */ /* * Copyright 1996 Matt Thomas <matt@3am-software.com> @@ -364,7 +364,8 @@ _rtld_process_hints(path_p, lib_p, fname) else { char tmp = b[len]; b[len] = '\0'; - _rtld_process_mapping(lib_p, b, len); + if (len != 0) + _rtld_process_mapping(lib_p, b, len); b[len] = tmp; } |
