AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Free errstring if _dl_addr doesn't returns 0

Browse Source
This commit is contained in:
Roland McGrath 2012-10-09 15:22:16 -07:00 committed by H.J. Lu
parent c8450f70fa
commit 273edc5e13
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2012-10-09 Joseph Myers <joseph@codesourcery.com>
* sysdeps/generic/_G_config.h (_G_off64_t): Remove. * sysdeps/generic/_G_config.h (_G_off64_t): Remove.

11
dlfcn/dlerror.c
View File

@ -1,5 +1,5 @@
/* Return error detail for failing <dlfcn.h> functions. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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 /* We can free the string only if the allocation happened in the
C library used by the dynamic linker. This means, it is 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; struct link_map *map = NULL;
Dl_info info; Dl_info info;
if (_dl_addr (check_free, &info, &map, NULL) != 0 if (_dl_addr (check_free, &info, &map, NULL) != 0 && map->l_ns == 0)
&& map != NULL && map->l_ns == 0) #endif
free ((char *) rec->errstring); free ((char *) rec->errstring);
} }
} }