diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-19 22:12:22 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-20 02:10:59 +0000 |
| commit | 1c4b185198ca798b4a27c7213da18b379c919804 (patch) | |
| tree | 4c4fc01c72617cc9dbb01d8d4f00daeaff6cca94 | |
| parent | c558379e4592b78d3010a7fbbdc4e61579984760 (diff) | |
| download | wireshark-1c4b185198ca798b4a27c7213da18b379c919804.tar.gz | |
AMQP: workaround some proto_tree_add_none_format() asserts
Previously proto_tree_add_none_format() could be called with any type
of field type, not FT_NONE only.
Change-Id: I78976a168fc1bf606b72ad38d284bb0bd1794b03
Ping-Bug: 13780
Reviewed-on: https://code.wireshark.org/review/22243
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 2de483c0925a5a93cdaee168997f3f3c7949d2d4)
Reviewed-on: https://code.wireshark.org/review/22257
| -rw-r--r-- | epan/dissectors/packet-amqp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 303bd3bbd2..43e2eac253 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -5927,13 +5927,13 @@ dissect_amqp_1_0_list(tvbuff_t *tvb, return 0; } - list_tree = proto_tree_add_none_format(item, - hf_amqp_type, - tvb, - offset-1, - element_size+1+count_len, - "%s", - name ? name : proto_registrar_get_name(hf_amqp_type)); + list_tree = proto_tree_add_item(item, + hf_amqp_type, + tvb, + offset-1, + element_size+1+count_len, + ENC_BIG_ENDIAN); + proto_item_set_text(list_tree, "%s", name ? name : proto_registrar_get_name(hf_amqp_type)); offset += (count_len*2); if (element_count > 0) @@ -6177,13 +6177,13 @@ dissect_amqp_1_0_array(tvbuff_t *tvb, &hf_amqp_subtypes_array, &decoded_element_size); - array_tree = proto_tree_add_none_format(item, - hf_amqp_type, - tvb, - offset-1, - element_size+1+count_len, - "%s", - name ? name : proto_registrar_get_name(hf_amqp_type)); + array_tree = proto_tree_add_item(item, + hf_amqp_type, + tvb, + offset-1, + element_size+1+count_len, + ENC_BIG_ENDIAN); + proto_item_set_text(array_tree, "%s", name ? name : proto_registrar_get_name(hf_amqp_type)); offset += (count_len*2+decoded_element_size); if (element_count > 0) |