3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-27 22:01:02 +08:00
Code Issues Projects Releases Wiki Activity

make .alloc and .free methods of ProtobufCAllocator callable again

Browse Source 
it turned out to be a bad idea to not export the default allocator's
methods via the ProtobufCAllocator's function pointers. there is at
least one user (protobuf-c-rpc) that makes allocations by directly
invoking those methods.
This commit is contained in:
Robert Edmonds 2014-01-13 21:47:28 -05:00
parent aaa40c5881
commit caff46e1f6
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
protobuf-c/protobuf-c.c
View File

@ -99,24 +99,29 @@ unsigned protobuf_c_minor = PROTOBUF_C_MINOR;
/* --- allocator --- */
static void *
system_alloc(void *allocator_data, size_t size)
{
return malloc(size);
}
static void
system_free(void *allocator_data, void *data)
{
free(data);
}
static inline void *
do_alloc(ProtobufCAllocator *allocator, size_t size)
{
if (allocator != NULL && allocator->alloc != NULL)
return allocator->alloc(allocator->allocator_data, size);
else
return malloc(size);
return allocator->alloc(allocator->allocator_data, size);
}
static inline void
do_free(ProtobufCAllocator *allocator, void *data)
{
if (data) {
if (allocator != NULL && allocator->free != NULL)
allocator->free(allocator->allocator_data, data);
else
free(data);
}
if (data != NULL)
allocator->free(allocator->allocator_data, data);
}
/*
@ -125,8 +130,8 @@ do_free(ProtobufCAllocator *allocator, void *data)
* messages.
*/
ProtobufCAllocator protobuf_c_default_allocator = {
.alloc = NULL,
.free = NULL,
.alloc = &system_alloc,
.free = &system_free,
.allocator_data = NULL,
};
@ -144,12 +149,12 @@ protobuf_c_buffer_simple_append(ProtobufCBuffer *buffer,
uint8_t *new_data;
while (new_alloced < new_len)
new_alloced += new_alloced;
new_data = do_alloc(NULL, new_alloced);
new_data = do_alloc(&protobuf_c_default_allocator, new_alloced);
if (!new_data)
return;
memcpy(new_data, simp->data, simp->len);
if (simp->must_free_data)
do_free(NULL, simp->data);
do_free(&protobuf_c_default_allocator, simp->data);
else
simp->must_free_data = 1;
simp->data = new_data;

9
protobuf-c/protobuf-c.h
View File

@ -460,12 +460,9 @@ struct _ProtobufCBufferSimple {
#define PROTOBUF_C_BUFFER_SIMPLE_CLEAR(simp_buf) \
do { \
if ((simp_buf)->must_free_data) { \
if (protobuf_c_default_allocator.free == NULL) \
free((simp_buf)->data); \
else \
protobuf_c_default_allocator.free( \
&protobuf_c_default_allocator, \
simp_buf); \
protobuf_c_default_allocator.free( \
&protobuf_c_default_allocator, \
(simp_buf)->data); \
} \
} while (0)