Signed-off-by: Adriaan de Jong <[email protected]>
---
buffer.c | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/buffer.c b/buffer.c
index 2f8e4b8..c39bbcb 100644
--- a/buffer.c
+++ b/buffer.c
@@ -310,28 +310,19 @@ gc_malloc (size_t size, bool clear, struct gc_arena *a)
#endif
{
void *ret;
- if (a)
- {
- struct gc_entry *e;
-#ifdef DMALLOC
- e = (struct gc_entry *) openvpn_dmalloc (file, line, size + sizeof
(struct gc_entry));
-#else
- e = (struct gc_entry *) malloc (size + sizeof (struct gc_entry));
-#endif
- check_malloc_return (e);
- ret = (char *) e + sizeof (struct gc_entry);
- e->next = a->list;
- a->list = e;
- }
- else
- {
+ ASSERT (NULL != a);
+
+ struct gc_entry *e;
#ifdef DMALLOC
- ret = openvpn_dmalloc (file, line, size);
+ e = (struct gc_entry *) openvpn_dmalloc (file, line, size + sizeof (struct
gc_entry));
#else
- ret = malloc (size);
+ e = (struct gc_entry *) malloc (size + sizeof (struct gc_entry));
#endif
- check_malloc_return (ret);
- }
+ check_malloc_return (e);
+ ret = (char *) e + sizeof (struct gc_entry);
+ e->next = a->list;
+ a->list = e;
+
#ifndef ZERO_BUFFER_ON_ALLOC
if (clear)
#endif
--
1.7.5.4
