Fix crash during error handling

diff --git a/ChangeLog b/ChangeLog
index 94d502ac6ffdb9c515caa3ab0c8941cbf23f6d35..91328e0483bd22b88031ed0594c7c97a10fecdc0 100644 (file)
--- 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 e8d0401f24804a6c3d223012642c9ac57a10a153..b8a2659af10ac18e2c1d2180c47db2a6055b5f4d 100644 (file)
--- 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);