diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dlfcn/dlerror.c | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 80bce18cca..4da05b81ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-10-09 Roland McGrath <roland@hack.frob.com> + + * dlfcn/dlerror.c (check_free): Call _dl_addr only if SHARED is + defined. Don't check if MAP is NULL. + 2012-10-09 Joseph Myers <joseph@codesourcery.com> * sysdeps/generic/_G_config.h (_G_off64_t): Remove. diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c index 8138cc2781..c30b4f1d39 100644 --- a/dlfcn/dlerror.c +++ b/dlfcn/dlerror.c @@ -1,5 +1,5 @@ /* Return error detail for failing <dlfcn.h> functions. - Copyright (C) 1995-2000,2002,2003,2004,2005 Free Software Foundation, Inc. + Copyright (C) 1995-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -190,11 +190,14 @@ check_free (struct dl_action_result *rec) { /* We can free the string only if the allocation happened in the C library used by the dynamic linker. This means, it is - always the C library in the base namespave. */ + always the C library in the base namespace. When we're statically + linked, the dynamic linker is part of the program and so always + uses the same C library we use here. */ +#ifdef SHARED struct link_map *map = NULL; Dl_info info; - if (_dl_addr (check_free, &info, &map, NULL) != 0 - && map != NULL && map->l_ns == 0) + if (_dl_addr (check_free, &info, &map, NULL) != 0 && map->l_ns == 0) +#endif free ((char *) rec->errstring); } } |