GNU C Library master sources branch, master, updated. glibc-2.14-258-g610f9ab

[schwab@sourceware.org]

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  610f9ab43eb24b8e94d0067d2c785ab4fdc411dc (commit)
      from  b49865be8e798e567a23c01f188546aef514ba06 (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=610f9ab43eb24b8e94d0067d2c785ab4fdc411dc

commit 610f9ab43eb24b8e94d0067d2c785ab4fdc411dc
Author: Andreas Schwab <schwab@redhat.com>
Date:   Thu Sep 8 12:02:26 2011 +0200

    Fix crash during error handling

diff --git a/ChangeLog b/ChangeLog
index 94d502a..91328e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-08  Andreas Schwab  <schwab@redhat.com>
+
+	* elf/dl-load.c (lose): Check for non-null l.
+
 2011-09-07  Ulrich Drepper  <drepper@gmail.com>
 
 	* elf/dl-load.c (open_verify): Use O_CLOEXEC.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index e8d0401..b8a2659 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -888,7 +888,7 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l,
   /* The file might already be closed.  */
   if (fd != -1)
     (void) __close (fd);
-  if (l->l_origin != (char *) -1l)
+  if (l != NULL && l->l_origin != (char *) -1l)
     free (l->l_origin);
   free (l);
   free (realname);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    4 ++++
 elf/dl-load.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources