diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-10-14 20:10:13 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-10-15 00:16:45 +0000 |
commit | 60e738cd2036af7c8f3654a44b7b6648360f1671 (patch) | |
tree | b3cf783462fbdc6bb58beba17ed9723583cfc45d /epan/dissectors/packet-raknet.c | |
parent | 0ac944944233b49c77a77da65be19ce4c2e65647 (diff) |
packet-raknet.c: value_string array (created at runtime) must be terminated with {0, NULL}.
This should fix crash in 'tshark -G values' seen on 64 bit tshark.
Change-Id: Ia183fc5d5604f71b824cf4f758c18ff1ccd4540f
Reviewed-on: https://code.wireshark.org/review/4694
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-raknet.c')
-rw-r--r-- | epan/dissectors/packet-raknet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index 7c97df1c26..c5e2b8d008 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -414,7 +414,7 @@ static const struct raknet_handler_entry raknet_handler[] = { /* * Look up packet id to packet name, value_string is wireshark type. */ -static value_string packet_names[RAKNET_PACKET_ID_COUNT]; +static value_string packet_names[RAKNET_PACKET_ID_COUNT+1]; static void raknet_init_packet_names(void) @@ -422,9 +422,11 @@ raknet_init_packet_names(void) unsigned int i; for (i = 0; i < RAKNET_PACKET_ID_COUNT; i++) { - packet_names[i].value = raknet_handler[i].vs.value; + packet_names[i].value = raknet_handler[i].vs.value; packet_names[i].strptr = raknet_handler[i].vs.strptr; } + packet_names[RAKNET_PACKET_ID_COUNT].value = 0; + packet_names[RAKNET_PACKET_ID_COUNT].strptr = NULL; } /* @@ -447,7 +449,7 @@ init_raknet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint *offset) ti = proto_tree_add_item(tree, proto_raknet, tvb, 0, -1, ENC_NA); sub_tree = proto_item_add_subtree(ti, ett_raknet); - packet_id = tvb_get_guint8(tvb, *offset); + packet_id = tvb_get_guint8(tvb, *offset); proto_tree_add_item(sub_tree, hf_raknet_packet_id, tvb, *offset, 1, ENC_BIG_ENDIAN); *offset += 1; |