osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

COSE: Fix fallback to CBOR dissection when map key is registered but disabled.

This commit is contained in:
Brian Sipos 2021-10-22 23:45:20 -04:00 committed by Wireshark GitLab Utility
parent 1e42357d19
commit d2b249a445
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-cose.c
View File

@ -397,8 +397,9 @@ static void dissect_header_pair(dissector_table_t dis_table, cose_header_context
gint sublen = 0;
if (dissector) {
sublen = call_dissector_with_data(dissector, tvb_value, pinfo, tree_label, ctx);
if ((sublen < 0) || ((guint)sublen < tvb_captured_length(tvb_value))) {
sublen = call_dissector_only(dissector, tvb_value, pinfo, tree_label, ctx);
if ((sublen < 0) ||
((sublen > 0) && ((guint)sublen < tvb_reported_length(tvb_value)))) {
expert_add_info(pinfo, proto_tree_get_parent(tree), &ei_value_partial_decode);
}
}
@ -698,7 +699,7 @@ static int dissect_cose_msg_tagged(tvbuff_t *tvb, packet_info *pinfo, proto_tree
continue;
}
g_log(LOG_DOMAIN, G_LOG_LEVEL_INFO, "main dissector using tag %" G_GUINT64_FORMAT, tag->value);
int sublen = call_dissector_with_data(dissector, tvb, pinfo, tree, tag);
int sublen = call_dissector_only(dissector, tvb, pinfo, tree, tag);
if (sublen > 0) {
return sublen;
}