From: hno <>
Date: Mon, 13 Aug 2007 08:39:06 +0000 (+0000)
Subject: Bug 1560: ftpSendPasv: getsockname(-1,..): (9) Bad file descriptor
X-Git-Tag: SQUID_3_0_PRE7~90
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3040645bb26ac9c489d86c28fc4d8ccb7f39f291;p=thirdparty%2Fsquid.git

Bug 1560: ftpSendPasv: getsockname(-1,..): (9) Bad file descriptor

missing returns could cause the ftp state machine to attempt to continue
after terminal failure.
---

diff --git a/src/ftp.cc b/src/ftp.cc
index 2390cacbc9..7a17e02a74 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.433 2007/08/12 23:57:28 amosjeffries Exp $
+ * $Id: ftp.cc,v 1.434 2007/08/13 02:39:06 hno Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -2172,6 +2172,7 @@ ftpReadMdtm(FtpStateData * ftpState)
         ftpState->unhack();
     } else if (code < 0) {
         ftpFail(ftpState);
+	return;
     }
 
     ftpSendSize(ftpState);
@@ -2217,6 +2218,7 @@ ftpReadSize(FtpStateData * ftpState)
         }
     } else if (code < 0) {
         ftpFail(ftpState);
+	return;
     }
 
     ftpSendPasv(ftpState);