From 610f9ab43eb24b8e94d0067d2c785ab4fdc411dc Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 8 Sep 2011 12:02:26 +0200 Subject: Fix crash during error handling --- ChangeLog | 4 ++++ elf/dl-load.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 94d502ac6f..91328e0483 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-08 Andreas Schwab + + * elf/dl-load.c (lose): Check for non-null l. + 2011-09-07 Ulrich Drepper * elf/dl-load.c (open_verify): Use O_CLOEXEC. diff --git a/elf/dl-load.c b/elf/dl-load.c index e8d0401f24..b8a2659af1 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); -- cgit 1.4.1