summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2015-11-30 20:53:03 +0100
committerAnders Broman <a.broman58@gmail.com>2015-11-30 21:03:37 +0000
commit9bd05a274f9e5ed9ba0435ff56de40835a47fb06 (patch)
treee107cb73a86d600a1fd98c32b3e67493f89c1ac2 /epan
parentd59335b9061fecfae59ffe54b86d9ee6ebfe9317 (diff)
downloadwireshark-9bd05a274f9e5ed9ba0435ff56de40835a47fb06.tar.gz
IMAP: fix Recurring check found by PVS Studio (V571)
The 'session_state->ssl_requested' condition was already verified in line 259 Change-Id: I6813176b2c235780785ff258377a7fd77a2cf24a Reviewed-on: https://code.wireshark.org/review/12311 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-imap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c
index c0e0f4028c..69cfa6c199 100644
--- a/epan/dissectors/packet-imap.c
+++ b/epan/dissectors/packet-imap.c
@@ -257,8 +257,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
/* If not yet switched to TLS, check for STARTTLS. */
if (session_state->ssl_requested) {
- if (!is_request && session_state->ssl_requested &&
- strncmp(tokenbuf, "ok", tokenlen) == 0) {
+ if (!is_request && strncmp(tokenbuf, "ok", tokenlen) == 0) {
/* STARTTLS accepted, next reply will be TLS. */
ssl_starttls_ack(ssl_handle, pinfo, imap_handle);
}