Module Name: src
Committed By: riz
Date: Wed Oct 17 22:36:59 UTC 2012
Modified Files:
src/libexec/ld.elf_so [netbsd-6]: rtld.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #605):
libexec/ld.elf_so/rtld.c: revision 1.159
On failure in _rtld_dlcheck, call _rtld_error, not xwarnx.
Callers need not call _rtld_error themselves now.
Fixes PR lib/41760. Should add the test case from the PR too.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.155.2.1 src/libexec/ld.elf_so/rtld.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.c
diff -u src/libexec/ld.elf_so/rtld.c:1.155 src/libexec/ld.elf_so/rtld.c:1.155.2.1
--- src/libexec/ld.elf_so/rtld.c:1.155 Fri Nov 25 21:27:15 2011
+++ src/libexec/ld.elf_so/rtld.c Wed Oct 17 22:36:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $ */
+/* $NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.155 2011/11/25 21:27:15 joerg Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -735,7 +735,7 @@ _rtld_dlcheck(void *handle)
break;
if (obj == NULL || obj->dl_refcount == 0) {
- xwarnx("Invalid shared object handle %p", handle);
+ _rtld_error("Invalid shared object handle %p", handle);
return NULL;
}
return obj;
@@ -1295,7 +1295,6 @@ dlinfo(void *handle, int req, void *v)
}
} else {
if ((obj = _rtld_dlcheck(handle)) == NULL) {
- _rtld_error("Invalid handle");
_rtld_shared_exit();
return -1;
}
