aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2017-10-18 21:23:42 +0200
committerMichael Mann <mmann78@netscape.net>2017-10-18 23:39:27 +0000
commitbc880f6c3e71c1e1ce4eb19f6cfa404ae4e6cda5 (patch)
tree7b4b7a53b4c473baf1c1c720e89f8e8bfb22bce7
parent288973ff7485d910fbef60ed2875edfd387f1a4f (diff)
FP Mux: reject empty tvb
Bug: 14140 Change-Id: I43c635e97f33c190e2a4a7f42e58f4274bd03f2b Reviewed-on: https://code.wireshark.org/review/23978 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-fp_mux.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-fp_mux.c b/epan/dissectors/packet-fp_mux.c
index 1758eba..d6369c8 100644
--- a/epan/dissectors/packet-fp_mux.c
+++ b/epan/dissectors/packet-fp_mux.c
@@ -257,6 +257,9 @@ static int heur_dissect_fp_mux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
struct fp_mux_info_t* fp_mux_info;
total_length = tvb_captured_length(tvb);
+ if (total_length == 0) {
+ return FALSE;
+ }
fp_mux_info = (fp_mux_info_t* )p_get_proto_data(wmem_file_scope(), pinfo, proto_fp_mux, 0);
if (fp_mux_info) {
@@ -325,7 +328,7 @@ static int heur_dissect_fp_mux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
conversation_set_dissector(conversation, fp_mux_handle);
dissect_fp_mux(tvb, pinfo, tree, data);
- return total_length;
+ return TRUE;
}