This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, ibm/2.13/master, updated. glibc-2.13-19-g1e2e988
- From: rsa at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 May 2011 22:16:07 -0000
- Subject: GNU C Library master sources branch, ibm/2.13/master, updated. glibc-2.13-19-g1e2e988
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, ibm/2.13/master has been updated
via 1e2e988b3d31acfb9cdb0c56684a2bb6a7c709fa (commit)
from 57c8c3969204c998ee8dc3bb172bc6423646b209 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1e2e988b3d31acfb9cdb0c56684a2bb6a7c709fa
commit 1e2e988b3d31acfb9cdb0c56684a2bb6a7c709fa
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Feb 25 16:51:24 2011 -0500
Don't crash when dependencies are missing
(Cherry picked from commit f2092faf2b6bd491a1891d5d5e393a8bf85d01d7)
diff --git a/ChangeLog b/ChangeLog
index bf85164..cbc68c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-17 Andreas Schwab <schwab@redhat.com>
+
+ [BZ #12454]
+ * elf/dl-deps.c (_dl_map_object_deps): Signal error early when
+ dependencies are missing.
+
2010-09-28 Andreas Schwab <schwab@redhat.com>
Ulrich Drepper <drepper@gmail.com>
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 440fb56..5288353 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -491,6 +491,10 @@ _dl_map_object_deps (struct link_map *map,
if (errno == 0 && errno_saved != 0)
__set_errno (errno_saved);
+ if (errno_reason)
+ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+ NULL, errstring);
+
struct link_map **old_l_initfini = NULL;
if (map->l_initfini != NULL && map->l_type == lt_loaded)
{
@@ -683,8 +687,4 @@ Filters not supported with LD_TRACE_PRELINKING"));
}
if (old_l_initfini != NULL)
_dl_scope_free (old_l_initfini);
-
- if (errno_reason)
- _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
- NULL, errstring);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
elf/dl-deps.c | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources