PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* miscfuncs.cc (__import_address): Check if malloc field points directly at 

'malloc'.
This commit is contained in:
Christopher Faylor 2013-01-23 14:24:34 +00:00
parent 0e8c8b0093
commit a69e27906f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2013-01-23 Christopher Faylor <me.cygwin2013@cgf.cx>
* miscfuncs.cc (__import_address): Check if malloc field points
directly at 'malloc'.
2013-01-23 Christopher Faylor <me.cygwin2013@cgf.cx>
* miscfuncs.cc (__import_address): On second thought, the chance that

3
winsup/cygwin/malloc_wrapper.cc
View File

@ -286,7 +286,8 @@ malloc_init ()
extern void *_sigfe_malloc;
/* Decide if we are using our own version of malloc by testing the import
address from user_data. */
use_internal = import_address (user_data->malloc) == &_sigfe_malloc;
use_internal = user_data->malloc == malloc
|| import_address (user_data->malloc) == &_sigfe_malloc;
malloc_printf ("using %s malloc", use_internal ? "internal" : "external");
internal_malloc_determined = true;
}