Module Name: src
Committed By: msaitoh
Date: Fri Apr 17 09:31:55 UTC 2015
Modified Files:
src/libexec/ld.elf_so [netbsd-6-1]: rtld.c
Log Message:
Pull up following revision(s) (requested by joerg in ticket #1288):
libexec/ld.elf_so/rtld.c: revision 1.176
lib/49813: Release mutex on error.
To generate a diff of this commit:
cvs rdiff -u -r1.155.2.1 -r1.155.2.1.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.2.1 src/libexec/ld.elf_so/rtld.c:1.155.2.1.2.1
--- src/libexec/ld.elf_so/rtld.c:1.155.2.1 Wed Oct 17 22:36:59 2012
+++ src/libexec/ld.elf_so/rtld.c Fri Apr 17 09:31:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $ */
+/* $NetBSD: rtld.c,v 1.155.2.1.2.1 2015/04/17 09:31:55 msaitoh Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.155.2.1 2012/10/17 22:36:59 riz Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.155.2.1.2.1 2015/04/17 09:31:55 msaitoh Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -1219,7 +1219,7 @@ dladdr(const void *addr, Dl_info *info)
obj = _rtld_obj_from_addr(addr);
if (obj == NULL) {
_rtld_error("No shared object contains address");
- lookup_mutex_enter();
+ lookup_mutex_exit();
return 0;
}
info->dli_fname = obj->path;
