mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
(_dl_close): If called recursively, just remember GC needs to be rerun and decrease l_direct_opencount. Avoid GC if l_direct_opencount decreased to 1. Rerun GC at the end if any destructor unloaded some additional libraries. * elf/Makefile: Add rules to build and run unload6 test. * elf/unload6.c: New test. * elf/unload6mod1.c: New file. * elf/unload6mod2.c: New file. * elf/unload6mod3.c: New file. * malloc/hooks.c (mem2chunk_check): Add magic_p argument, set *magic_p if magic_p is not NULL. (top_check): Invoke MALLOC_FAILURE_ACTION if MORECORE failed. (malloc_check): Fail if sz == -1. (free_check): Adjust mem2chunk_check caller. (realloc_check): Likewise. Fail if bytes == -1. If bytes == 0 and oldmem != NULL, call free_check and return NULL. If reallocating and returning NULL, invert magic byte again to make oldmem valid region for further checking. (memalign_check): Fail if bytes == -1. * malloc/Makefile: Add rules to build and run tst-mcheck. * malloc/tst-mcheck.c: New test.cvs/glibc-2_5-branch
Ulrich Drepper
21 years ago
10 changed files with 302 additions and 26 deletions
@ -0,0 +1,30 @@ |
|||
#include <dlfcn.h> |
|||
#include <stdio.h> |
|||
|
|||
int |
|||
main (void) |
|||
{ |
|||
void *h = dlopen ("unload6mod1.so", RTLD_LAZY); |
|||
if (h == NULL) |
|||
{ |
|||
puts ("dlopen unload6mod1.so failed"); |
|||
return 1; |
|||
} |
|||
|
|||
int (*fn) (int); |
|||
fn = dlsym (h, "foo"); |
|||
if (fn == NULL) |
|||
{ |
|||
puts ("dlsym failed"); |
|||
return 1; |
|||
} |
|||
|
|||
int val = fn (16); |
|||
if (val != 24) |
|||
{ |
|||
printf ("foo returned %d != 24\n", val); |
|||
return 1; |
|||
} |
|||
|
|||
return 0; |
|||
} |
|||
@ -0,0 +1,16 @@ |
|||
#include <dlfcn.h> |
|||
#include <stdio.h> |
|||
|
|||
int |
|||
foo (int i) |
|||
{ |
|||
void *h = dlopen ("unload6mod2.so", RTLD_LAZY); |
|||
if (h == NULL) |
|||
{ |
|||
puts ("dlopen unload6mod2.so failed"); |
|||
return 1; |
|||
} |
|||
|
|||
dlclose (h); |
|||
return i + 8; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
#include <dlfcn.h> |
|||
#include <stdio.h> |
|||
#include <unistd.h> |
|||
|
|||
static void *h; |
|||
|
|||
static void __attribute__((constructor)) |
|||
mod2init (void) |
|||
{ |
|||
h = dlopen ("unload6mod3.so", RTLD_LAZY); |
|||
if (h == NULL) |
|||
{ |
|||
puts ("dlopen unload6mod3.so failed"); |
|||
fflush (stdout); |
|||
_exit (1); |
|||
} |
|||
} |
|||
|
|||
static void __attribute__((destructor)) |
|||
mod2fini (void) |
|||
{ |
|||
dlclose (h); |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
#include <dlfcn.h> |
|||
#include <stdio.h> |
|||
#include <unistd.h> |
|||
|
|||
static void *h; |
|||
|
|||
static void __attribute__((constructor)) |
|||
mod3init (void) |
|||
{ |
|||
h = dlopen ("unload6mod1.so", RTLD_LAZY); |
|||
if (h == NULL) |
|||
{ |
|||
puts ("dlopen unload6mod1.so failed"); |
|||
fflush (stdout); |
|||
_exit (1); |
|||
} |
|||
} |
|||
|
|||
static void __attribute__((destructor)) |
|||
mod3fini (void) |
|||
{ |
|||
dlclose (h); |
|||
} |
|||
@ -0,0 +1,91 @@ |
|||
/* Copyright (C) 2005 Free Software Foundation, Inc.
|
|||
This file is part of the GNU C Library. |
|||
Contributed by Jakub Jelinek <jakub@redhat.com>, 2005. |
|||
|
|||
The GNU C Library is free software; you can redistribute it and/or |
|||
modify it under the terms of the GNU Lesser General Public |
|||
License as published by the Free Software Foundation; either |
|||
version 2.1 of the License, or (at your option) any later version. |
|||
|
|||
The GNU C Library is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|||
Lesser General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU Lesser General Public |
|||
License along with the GNU C Library; if not, write to the Free |
|||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA |
|||
02111-1307 USA. */ |
|||
|
|||
#include <errno.h> |
|||
#include <stdio.h> |
|||
#include <stdlib.h> |
|||
|
|||
static int errors = 0; |
|||
|
|||
static void |
|||
merror (const char *msg) |
|||
{ |
|||
++errors; |
|||
printf ("Error: %s\n", msg); |
|||
} |
|||
|
|||
int |
|||
main (void) |
|||
{ |
|||
void *p, *q; |
|||
|
|||
errno = 0; |
|||
|
|||
p = malloc (-1); |
|||
|
|||
if (p != NULL) |
|||
merror ("malloc (-1) succeeded."); |
|||
else if (errno != ENOMEM) |
|||
merror ("errno is not set correctly."); |
|||
|
|||
p = malloc (10); |
|||
if (p == NULL) |
|||
merror ("malloc (10) failed."); |
|||
|
|||
p = realloc (p, 0); |
|||
if (p != NULL) |
|||
merror ("realloc (p, 0) failed."); |
|||
|
|||
p = malloc (0); |
|||
if (p == NULL) |
|||
merror ("malloc (0) failed."); |
|||
|
|||
p = realloc (p, 0); |
|||
if (p != NULL) |
|||
merror ("realloc (p, 0) failed."); |
|||
|
|||
q = malloc (256); |
|||
if (q == NULL) |
|||
merror ("malloc (256) failed."); |
|||
|
|||
p = malloc (512); |
|||
if (p == NULL) |
|||
merror ("malloc (512) failed."); |
|||
|
|||
if (realloc (p, -256) != NULL) |
|||
merror ("realloc (p, -256) succeeded."); |
|||
else if (errno != ENOMEM) |
|||
merror ("errno is not set correctly."); |
|||
|
|||
free (p); |
|||
|
|||
p = malloc (512); |
|||
if (p == NULL) |
|||
merror ("malloc (512) failed."); |
|||
|
|||
if (realloc (p, -1) != NULL) |
|||
merror ("realloc (p, -1) succeeded."); |
|||
else if (errno != ENOMEM) |
|||
merror ("errno is not set correctly."); |
|||
|
|||
free (p); |
|||
free (q); |
|||
|
|||
return errors != 0; |
|||
} |
|||
Loading…
Reference in new issue