[src/trunk]: src/libexec/ld.elf_so On failure in _rtld_dlcheck, call _rtld_er...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bb9506c4c17c
branches:  trunk
changeset: 781792:bb9506c4c17c
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Oct 01 03:03:46 2012 +0000

description:
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.

diffstat:

 libexec/ld.elf_so/rtld.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 138330994736 -r bb9506c4c17c libexec/ld.elf_so/rtld.c
--- a/libexec/ld.elf_so/rtld.c  Sun Sep 30 21:36:18 2012 +0000
+++ b/libexec/ld.elf_so/rtld.c  Mon Oct 01 03:03:46 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.c,v 1.158 2012/08/15 03:46:06 matt Exp $   */
+/*     $NetBSD: rtld.c,v 1.159 2012/10/01 03:03:46 riastradh Exp $      */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.158 2012/08/15 03:46:06 matt Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.159 2012/10/01 03:03:46 riastradh Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -775,7 +775,7 @@
                        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;
@@ -1335,7 +1335,6 @@
                }
        } else {
                if ((obj = _rtld_dlcheck(handle)) == NULL) {
-                       _rtld_error("Invalid handle");
                        _rtld_shared_exit();
                        return -1;
                }