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

Exported PDU: dump payload before calling sub dissector 

This way, the payload is displayed even if the sub dissector triggers an exception

Change-Id: Ife062f59035776c4eb9e550eb202a5e40afc4b60
Reviewed-on: https://code.wireshark.org/review/17063
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2016-08-15 19:12:11 +02:00
parent ede140a46a
commit fab5a74074
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-exported_pdu.c
View File

@ -275,6 +275,7 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
} while(tag != 0);
payload_tvb = tvb_new_subset_remaining(tvb, offset);
proto_tree_add_item(exported_pdu_tree, hf_exported_pdu_exported_pdu, payload_tvb, 0, -1, ENC_NA);
switch(next_proto_type) {
case EXPORTED_PDU_NEXT_PROTO_STR:
@ -308,7 +309,6 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
break;
}
proto_tree_add_item(exported_pdu_tree, hf_exported_pdu_exported_pdu, payload_tvb, 0, -1, ENC_NA);
return tvb_captured_length(tvb);
}