osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

If the requested wmem allocator is NULL, take that to mean manually-managed 

memory. This permits using manually-scoped versions of certain wmem structures.

svn path=/trunk/; revision=47657
This commit is contained in:
Evan Huus 2013-02-14 16:23:22 +00:00
parent 5071e8b627
commit cb679f279b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/wmem/wmem_core.c
View File

@ -37,6 +37,10 @@
void *
wmem_alloc(wmem_allocator_t *allocator, const size_t size)
{
if (allocator == NULL) {
return g_malloc(size);
}
if (size == 0) {
return NULL;
}
@ -61,6 +65,11 @@ wmem_alloc0(wmem_allocator_t *allocator, const size_t size)
void
wmem_free(wmem_allocator_t *allocator, void *ptr)
{
if (allocator == NULL) {
g_free(ptr);
return;
}
if (ptr == NULL) {
return;
}
@ -71,6 +80,10 @@ wmem_free(wmem_allocator_t *allocator, void *ptr)
void *
wmem_realloc(wmem_allocator_t *allocator, void *ptr, const size_t size)
{
if (allocator == NULL) {
return g_realloc(ptr, size);
}
if (ptr == NULL) {
return wmem_alloc(allocator, size);
}