This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-256-gfdc86bc
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Sep 2011 03:50:56 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-256-gfdc86bc
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, master has been updated
via fdc86bc9a83c23b08b8f6d4b53df2f56e15f3e85 (commit)
from c966526aa40273e0da42dfd26fa8c0f409e69b86 (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=fdc86bc9a83c23b08b8f6d4b53df2f56e15f3e85
commit fdc86bc9a83c23b08b8f6d4b53df2f56e15f3e85
Author: Ulrich Drepper <drepper@gmail.com>
Date: Wed Sep 7 23:50:40 2011 -0400
Pass back error code from dlerror_run
diff --git a/ChangeLog b/ChangeLog
index 7e77bc9..0d2580d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-09-07 Ulrich Drepper <drepper@gmail.com>
+ * elf/dl-libc.c (dlerror_run): Pass back error code from
+ dl_catch_error.
+
[BZ #13123]
* elf/dl-load.c (lose): Free l_origin if it is valid.
diff --git a/elf/dl-libc.c b/elf/dl-libc.c
index e440d01..828588a 100644
--- a/elf/dl-libc.c
+++ b/elf/dl-libc.c
@@ -45,10 +45,10 @@ dlerror_run (void (*operate) (void *), void *args)
const char *last_errstring = NULL;
bool malloced;
- (void) GLRO(dl_catch_error) (&objname, &last_errstring, &malloced,
- operate, args);
+ int result = (GLRO(dl_catch_error) (&objname, &last_errstring, &malloced,
+ operate, args)
+ ?: last_errstring != NULL);
- int result = last_errstring != NULL;
if (result && malloced)
free ((char *) last_errstring);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
elf/dl-libc.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources