diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-03-27 10:11:00 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-03-27 20:27:07 +0000 |
| commit | 2e6b7c5abba917dee224cb3503e8c7f8af73f586 (patch) | |
| tree | 7cb9674fc6ed872d486df75191b39744192d015e /epan/address.h | |
| parent | 1459b9bee30f37ab907f0091a2b488eb0f811863 (diff) | |
If setting an address from a tvb and the address length is 0, the address should be NULL.
Bug: 12295
Change-Id: I875308a16b11023a691d34057c7f8561a15aa598
Reviewed-on: https://code.wireshark.org/review/14649
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/address.h')
| -rw-r--r-- | epan/address.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/address.h b/epan/address.h index 15f92f9d1b..5a6ed9bad0 100644 --- a/epan/address.h +++ b/epan/address.h @@ -116,7 +116,10 @@ static inline void set_address_tvb(address *addr, int addr_type, int addr_len, tvbuff_t *tvb, int offset) { const void *p; - p = tvb_get_ptr(tvb, offset, addr_len); + if (addr_len != 0) + p = tvb_get_ptr(tvb, offset, addr_len); + else + p = NULL; set_address(addr, addr_type, addr_len, p); } |