From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 20 Jul 2015 20:39:02 +0000 (+0200)
Subject: Revert and improve fix for FtpClient.cc
X-Git-Tag: merge-candidate-3-v1~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2eefbb0fd93383e01d2dfad5db2e52ebac91fbdd;p=thirdparty%2Fsquid.git

Revert and improve fix for FtpClient.cc
---

diff --git a/src/clients/FtpClient.cc b/src/clients/FtpClient.cc
index 740771e420..b496f75825 100644
--- a/src/clients/FtpClient.cc
+++ b/src/clients/FtpClient.cc
@@ -509,9 +509,10 @@ Ftp::Client::handleEpsvReply(Ip::Address &remoteAddr)
             debugs(9, DBG_IMPORTANT, "WARNING: Server at " << ctrl.conn->remote << " sent unknown protocol negotiation hint: " << buf);
             return sendPassive();
         }
-        /* not reached */
-        // failed(ERR_FTP_FAILURE, 0);
-        // return false;
+        /* coverity[unreachable] */
+        /* safeguard against possible future bugs in above conditions */
+        failed(ERR_FTP_FAILURE, 0);
+        return false;
     }
 
     /*  229 Entering Extended Passive Mode (|||port|) */