diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-18 14:00:02 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-03-18 14:00:02 +0000 |
| commit | c49205ed0f10ca61c620cda87e2de4446423a25c (patch) | |
| tree | dcb09a15ddebb8cc9a15f0f42c21d1cd6eaea009 /epan/dissectors/packet-ua3g.c | |
| parent | 9ce0b54c8f17cac1c5ee956a79aa62f06a561398 (diff) | |
Fix one of the dissector assertions in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6962 :
Don't use a proto_item as the tree in proto_tree_add_text(). (There's code
here to hang a subtree off the item but it's commented out.)
svn path=/trunk/; revision=41638
Diffstat (limited to 'epan/dissectors/packet-ua3g.c')
| -rw-r--r-- | epan/dissectors/packet-ua3g.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 3da63d212c..655e33d8da 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -4472,9 +4472,9 @@ decode_unsolicited_msg(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo, TM KEY PUSHED - 2Dh (MESSAGE FROM THE TERMINAL) ---------------------------------------------------------------------------*/ static void -decode_key_number(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo _U_, +decode_key_number(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint offset, guint length, guint8 opcode _U_, - proto_item *ua3g_body_item) + proto_item *ua3g_body_item _U_) { /* proto_tree *ua3g_body_tree;*/ /* @@ -4488,7 +4488,7 @@ decode_key_number(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo _U_, */ if(length > 0) { /* ua3g_body_tree = proto_item_add_subtree(ua3g_body_item, ett_ua3g_body);*/ - proto_tree_add_text(ua3g_body_item, tvb, offset, length, + proto_tree_add_text(tree, tvb, offset, length, "Key Number: Row %d, Column %d", (tvb_get_guint8(tvb, offset) & 0xF0), (tvb_get_guint8(tvb, offset) & 0x0F)); } |