From d59335b9061fecfae59ffe54b86d9ee6ebfe9317 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Mon, 30 Nov 2015 17:26:30 +0100 Subject: [PATCH] adb service/logcat : fix Consider inspecting this expression. The expression is excessive or contains a misprint found by PVS Studio (V590) Change-Id: I59cf9c8b2aab347023dea323602dd6ff85ac7ab6 Reviewed-on: https://code.wireshark.org/review/12309 Reviewed-by: Anders Broman --- epan/dissectors/packet-adb_service.c | 2 +- epan/dissectors/packet-logcat.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-adb_service.c b/epan/dissectors/packet-adb_service.c index 5d2db14c5f..14df595976 100644 --- a/epan/dissectors/packet-adb_service.c +++ b/epan/dissectors/packet-adb_service.c @@ -494,7 +494,7 @@ dissect_adb_service(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d payload_length = tvb_get_letohs(next_tvb, i_offset); try_header_size = tvb_get_letohs(next_tvb, i_offset + 2); - if (try_header_size == 0 || try_header_size != 24) + if (try_header_size != 24) logcat_length = payload_length + 20; else logcat_length = payload_length + 24; diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index d1e3d581e7..5801da9591 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -83,7 +83,7 @@ static gint detect_version(tvbuff_t *tvb, gint offset) { payload_length = tvb_get_letohs(tvb, offset); try_header_size = tvb_get_letohs(tvb, offset + 2); - if (try_header_size == 0 || try_header_size != 24) + if (try_header_size != 24) return 1; if (tvb_reported_length_remaining(tvb, offset + 24 + payload_length) >= 0)