roken: Use a common allocator for all windows
Windows applications become very unhappy when memory is allocated in one module (exe or dll) and deallocated in another. This is because each of the C run time library instances uses its own heap. Mixing allocating in one heap and deallocating in another will lead to memory leaks and heap corruption. For modules that build against roken avoid this problem by sharing roken's allocator with the module that uses it. Change-Id: I31e35c600a78350b168a281811160696dc327544
This commit is contained in:
@@ -116,6 +116,7 @@ libroken_la_OBJS = \
|
||||
$(OBJ)\warn.obj \
|
||||
$(OBJ)\warnerr.obj \
|
||||
$(OBJ)\warnx.obj \
|
||||
$(OBJ)\win32_alloc.obj \
|
||||
$(OBJ)\xfree.obj
|
||||
|
||||
!if $(NMAKE_WINVER) < 0x0600
|
||||
|
@@ -36,6 +36,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "roken.h"
|
||||
#undef realloc
|
||||
|
||||
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
||||
rk_realloc(void *ptr, size_t size)
|
||||
|
@@ -352,6 +352,26 @@ rk_vsnprintf (char *str, size_t sz, const char *format, va_list args);
|
||||
S_ISBLK(m)
|
||||
*/
|
||||
|
||||
#if !defined(ROKEN_NO_DEFINE_ALLOCATORS)
|
||||
/* Ensure that a common memory allocator is used by all */
|
||||
#define calloc rk_calloc
|
||||
#define free rk_free
|
||||
#define malloc rk_malloc
|
||||
#define realloc rk_realloc
|
||||
#endif
|
||||
|
||||
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
||||
rk_calloc(size_t, size_t);
|
||||
|
||||
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
|
||||
rk_free(void *);
|
||||
|
||||
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
||||
rk_malloc(size_t);
|
||||
|
||||
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
||||
rk_realloc(void *, size_t);
|
||||
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
#ifdef HAVE_WINSOCK
|
||||
|
62
lib/roken/win32_alloc.c
Normal file
62
lib/roken/win32_alloc.c
Normal file
@@ -0,0 +1,62 @@
|
||||
/***********************************************************************
|
||||
* Copyright (c) 2012, Secure Endpoints Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* - Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* - Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
**********************************************************************/
|
||||
#include <config.h>
|
||||
#include "roken.h"
|
||||
#undef calloc
|
||||
#undef malloc
|
||||
#undef free
|
||||
|
||||
/*
|
||||
* Windows executables and dlls suffer when memory is
|
||||
* allocated with one allocator and deallocated with
|
||||
* another because each allocator is backed by a separate
|
||||
* heap. Reduce the exposure by ensuring that all
|
||||
* binaries that are built using roken will build against
|
||||
* same allocator.
|
||||
*/
|
||||
|
||||
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
||||
rk_calloc(size_t elements, size_t size)
|
||||
{
|
||||
return calloc( elements, size);
|
||||
}
|
||||
|
||||
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
|
||||
rk_free(void * ptr)
|
||||
{
|
||||
free( ptr);
|
||||
}
|
||||
|
||||
ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
|
||||
rk_malloc(size_t size)
|
||||
{
|
||||
return malloc( size);
|
||||
}
|
Reference in New Issue
Block a user