github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 14:22:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core/SSL: Fixed issues with memory allocation and freeing

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11763 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-02-06 09:37:03 +00:00
parent aa1abf4d8f
commit c02bb2da33
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
uppsrc/Core/SSL/InitExit.cpp
View file

@ -6,11 +6,7 @@ namespace Upp {
static int64 UPP_SSL_alloc = 0;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
static void *SslAlloc(size_t size, const char *, int)
#else
static void *SslAlloc(size_t size)
#endif
static void *SslAlloc0(size_t size)
{
LLOG("Alloc " << size);
size_t alloc = size + sizeof(int64);
@ -21,6 +17,15 @@ static void *SslAlloc(size_t size)
return aptr;
}
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
static void *SslAlloc(size_t size, const char *, int)
#else
static void *SslAlloc(size_t size)
#endif
{
return SslAlloc0(size);
}
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
static void SslFree(void *ptr, const char *, int)
#else
@ -41,8 +46,9 @@ static void *SslRealloc(void *ptr, size_t size, const char *, int)
static void *SslRealloc(void *ptr, size_t size)
#endif
{
LLOG("SslRealloc " << ptr << ", " << size);
if(!ptr)
return NULL;
return SslAlloc0(size);
int64 *aptr = (int64 *)ptr - 1;
if((int64)(size + sizeof(int64)) <= *aptr) {
LLOG("UPP_SSL_REALLOC(" << ptr << ", " << (int64)size << ", alloc " << *aptr << ") -> keep same block");
@ -82,13 +88,12 @@ EXITBLOCK
ENGINE_cleanup();
CRYPTO_cleanup_all_ex_data();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_remove_state(0);
#endif
ERR_free_strings();
STACK_OF(SSL_COMP) *pCOMP = SSL_COMP_get_compression_methods();
if(pCOMP)
sk_SSL_COMP_free( pCOMP );
ERR_remove_state(0);
#endif
ERR_free_strings();
}
#if defined(_MULTITHREADED) && OPENSSL_VERSION_NUMBER < 0x10100000L