Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so Don't call _rtld_process_mapping() with nu...



details:   https://anonhg.NetBSD.org/src/rev/fd70106f4bcc
branches:  trunk
changeset: 537748:fd70106f4bcc
user:      junyoung <junyoung%NetBSD.org@localhost>
date:      Sat Oct 05 15:04:49 2002 +0000

description:
Don't call _rtld_process_mapping() with null string.

diffstat:

 libexec/ld.elf_so/Makefile |  4 ++--
 libexec/ld.elf_so/paths.c  |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 3abd6255099d -r fd70106f4bcc libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Sat Oct 05 14:59:36 2002 +0000
+++ b/libexec/ld.elf_so/Makefile        Sat Oct 05 15:04:49 2002 +0000
@@ -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+= -I${.CURDIR}
 CPPFLAGS+= -DRTLD_LOADER
 CPPFLAGS+= -D_RTLD_SOURCE
-#CPPFLAGS+= -DDEBUG
+CPPFLAGS+= -DDEBUG
 #CPPFLAGS+= -DRTLD_DEBUG
 #CPPFLAGS+= -DRTLD_DEBUG_RELOC
 #DBG=  -g
diff -r 3abd6255099d -r fd70106f4bcc libexec/ld.elf_so/paths.c
--- a/libexec/ld.elf_so/paths.c Sat Oct 05 14:59:36 2002 +0000
+++ b/libexec/ld.elf_so/paths.c Sat Oct 05 15:04:49 2002 +0000
@@ -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@localhost>
@@ -364,7 +364,8 @@
                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;
                }
                        



Home | Main Index | Thread Index | Old Index