wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1074004 - Bustage fix for nestegg_set_halloc_func.

Browse Source 
--HG--
extra : rebase_source : 7e24e953dc287e80112e0a0d4263b6ac5b1fbd8d
This commit is contained in:
Matthew Gregan 2014-09-30 16:20:56 +13:00
parent 1d61b4360f
commit 5264cdc15c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/libnestegg/README_MOZILLA
View File

@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
The git commit ID used was 2f596487949b192fb15866c6f8ecc6b04df92cb8.
The git commit ID used was ec23378e70030bacf3b4905c444c38ef4a37bceb.

13
media/libnestegg/src/halloc.c
View File

@ -40,10 +40,8 @@ typedef struct hblock
*
*/
realloc_t halloc_allocator = NULL;
realloc_t halloc_wrapped_allocator = NULL;
#define allocator halloc_allocator
#define wrapped_allocator halloc_wrapped_allocator
/*
* static methods
@ -64,7 +62,10 @@ void * halloc(void * ptr, size_t len)
/* set up default allocator */
if (! allocator)
{
halloc_set_allocator(realloc);
if (halloc_set_allocator(realloc) == 0)
{
halloc_set_allocator(_realloc);
}
assert(allocator);
}
@ -189,7 +190,6 @@ int halloc_set_allocator(realloc_t realloc_func)
*
* Thanks to Stan Tobias for pointing this tricky part out.
*/
allocator = realloc_func;
if (! (p = malloc(1)))
/* hmm */
return -1;
@ -197,11 +197,10 @@ int halloc_set_allocator(realloc_t realloc_func)
if ((p = realloc_func(p, 0)))
{
/* realloc_func cannot be used as free() */
allocator = _realloc;
wrapped_allocator = realloc_func;
free(p);
return 0;
}
allocator = realloc_func;
return 1;
}
@ -211,7 +210,7 @@ static void * _realloc(void * ptr, size_t n)
* free'ing realloc()
*/
if (n)
return wrapped_allocator(ptr, n);
return realloc(ptr, n);
free(ptr);
return NULL;
}