diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-01-06 23:25:09 +0100 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2016-01-09 17:04:16 +0000 |
| commit | 859e1ee1d5926b4ab878ac5dceaba14e303b58de (patch) | |
| tree | ad4d0bf52c43a53a05822a5637365012cb44e876 /epan/dissectors/packet-dcm.c | |
| parent | cbbb57492968f4598c1d5fe2240f66bbd8523a25 (diff) | |
[dcm] set a reasonable return value if we need more data
in other similar cases, we return tvb_captured_length(tvb)
do this here as well instead of returning TRUE where we should return a number
Change-Id: Ifafdb7011256100d127033c0a43d100525f6a42b
Reviewed-on: https://code.wireshark.org/review/13084
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
| -rw-r--r-- | epan/dissectors/packet-dcm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 1a0109bb37..f5056da1ed 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6890,7 +6890,7 @@ dissect_dcm_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i /* we need 6 bytes at least to get PDU length */ pinfo->desegment_offset = offset; pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; - return TRUE; + return tvb_captured_length(tvb); } } else { @@ -6951,11 +6951,7 @@ dissect_dcm_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i pinfo->desegment_offset = offset; pinfo->desegment_len = (pdu_len+6) - (tlen-offset); - - /* Why return a Boolean for a deliberate int function? No clue, but - no better working example found. - */ - return TRUE; + return tvb_captured_length(tvb); } /* Process a whole PDU */ |