From 1ec868edddbca60e367f0681db8a5ee5aa32fe74 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Fri, 5 Jun 2015 15:43:10 +0200 Subject: Fix a few issues reported by PVS-Studio See http://www.viva64.com/en/b/0328/ for details Change-Id: Ic9ddfd690b49401c96cb8a4a277c671f9824be31 Reviewed-on: https://code.wireshark.org/review/8775 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Pascal Quantin --- plugins/ethercat/packet-ethercat-datagram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/ethercat') diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index cdb0ccb0c0..cd7761b49d 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -514,7 +514,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree subsize = get_cmd_len(&ecHdr); len = ecHdr.len & 0x07ff; - if ( len >= sizeof(ETHERCAT_MBOX_HEADER_LEN) && + if ( len >= ETHERCAT_MBOX_HEADER_LEN && (ecHdr.cmd==EC_CMD_TYPE_FPWR || ecHdr.cmd==EC_CMD_TYPE_FPRD || ecHdr.cmd==EC_CMD_TYPE_APWR || ecHdr.cmd==EC_CMD_TYPE_APRD) && ecHdr.anAddrUnion.a.ado>=0x1000 ) @@ -528,7 +528,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree case ETHERCAT_MBOX_TYPE_FOE: case ETHERCAT_MBOX_TYPE_COE: case ETHERCAT_MBOX_TYPE_SOE: - if ( /*pMBox->Length > 0 &&*/ mbox.Length <= 1500 /*&& pMBox->Length+sizeof(ETHERCAT_MBOX_HEADER_LEN) >= len*/ ) + if ( /*pMBox->Length > 0 &&*/ mbox.Length <= 1500 /*&& (pMBox->Length+ETHERCAT_MBOX_HEADER_LEN) >= len*/ ) { bMBox = TRUE; } -- cgit v1.2.3