diff options
| -rw-r--r-- | epan/address.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/address.h b/epan/address.h index 730acfb136..15f92f9d1b 100644 --- a/epan/address.h +++ b/epan/address.h @@ -133,16 +133,16 @@ set_address_tvb(address *addr, int addr_type, int addr_len, tvbuff_t *tvb, int o static inline void alloc_address_wmem(wmem_allocator_t *scope, address *addr, int addr_type, int addr_len, const void *addr_data) { - if (addr == NULL) - return; + g_assert(addr); + clear_address(addr); addr->type = addr_type; - addr->len = addr_len; - if (addr_type == AT_NONE || addr->len <= 0) { - addr->data = addr->priv = NULL; + if (addr_type == AT_NONE || addr_len <= 0 || addr_data == NULL) { + g_assert(addr_len <= 0); + g_assert(addr_data == NULL); return; } - addr->priv = wmem_memdup(scope, addr_data, addr->len); - addr->data = addr->priv; + addr->data = addr->priv = wmem_memdup(scope, addr_data, addr_len); + addr->len = addr_len; } /** Allocate an address from TVB data. |