bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

- switch BLI_memarena to use stdlib malloc/free (alloc errors

Browse Source 
will be caught by containing structure)
 - fixed off-by-one bug (reallocated one byte before necessary)
This commit is contained in:
Daniel Dunbar 2005-03-21 00:48:19 +00:00
parent 99676b7bfb
commit 6e41cb0a97
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenlib/intern/BLI_memarena.c
View File

@ -31,6 +31,8 @@
* Efficient memory allocation for lots of similar small chunks.
*/
#include <stdlib.h>
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
@ -55,7 +57,7 @@ MemArena *BLI_memarena_new(int bufsize) {
return ma;
}
void BLI_memarena_free(MemArena *ma) {
BLI_linklist_free(ma->bufs, (void(*)(void*)) MEM_freeN);
BLI_linklist_free(ma->bufs, (void(*)(void*)) free);
MEM_freeN(ma);
}
@ -69,9 +71,9 @@ void *BLI_memarena_alloc(MemArena *ma, int size) {
* size up to multiple of 8 */
size= PADUP(size, 8);
if (size>=ma->cursize) {
if (size>ma->cursize) {
ma->cursize= (size>ma->bufsize)?size:ma->bufsize;
ma->curbuf= MEM_mallocN(ma->cursize, "ma->curbuf");
ma->curbuf= malloc(ma->cursize);
BLI_linklist_prepend(&ma->bufs, ma->curbuf);
}