diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-07-13 21:46:27 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-07-13 21:46:27 +0000 |
| commit | a099ae38f518d1ce057271d5214d4e36af38da9c (patch) | |
| tree | 2221b0769b79822f16b9886bde8db633b10b56a8 /epan/dissectors/packet-enip.c | |
| parent | 472db7609cd01d61dabe7df191ac71d53a6a366a (diff) | |
tvb_length_remaining() can return -1, so be sure to deal with it if it does.
svn path=/trunk/; revision=43704
Diffstat (limited to 'epan/dissectors/packet-enip.c')
| -rw-r--r-- | epan/dissectors/packet-enip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 81d0f7c0ad..299dda9d9b 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1357,7 +1357,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, /* Call dissector for interface */ next_tvb = tvb_new_subset( tvb, offset+6, item_length, item_length ); p_add_proto_data(pinfo->fd, proto_enip, request_info); - if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_uint(subdissector_srrd_table, ifacehndl, next_tvb, pinfo, dissector_tree) ) + if( tvb_length_remaining(next_tvb, 0) <= 0 || !dissector_try_uint(subdissector_srrd_table, ifacehndl, next_tvb, pinfo, dissector_tree) ) { /* Show the undissected payload */ if( tvb_length_remaining(tvb, offset) > 0 ) @@ -1412,7 +1412,7 @@ dissect_cpf(enip_request_key_t *request_key, int command, tvbuff_t *tvb, /* Call dissector for interface */ next_tvb = tvb_new_subset (tvb, offset+8, item_length-2, item_length-2); p_add_proto_data(pinfo->fd, proto_enip, request_info); - if( tvb_length_remaining(next_tvb, 0) == 0 || !dissector_try_uint(subdissector_sud_table, ifacehndl, next_tvb, pinfo, dissector_tree) ) + if( tvb_length_remaining(next_tvb, 0) <= 0 || !dissector_try_uint(subdissector_sud_table, ifacehndl, next_tvb, pinfo, dissector_tree) ) { /* Show the undissected payload */ if( tvb_length_remaining(tvb, offset) > 0 ) |