---------------------
PatchSet 11560 
Date: 2007/08/13 02:39:27
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Bug 1560: ftpSendPasv: getsockname(-1,..): (9) Bad file descriptor

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

Members: 
	src/ftp.c:1.347->1.348 

Index: squid/src/ftp.c
===================================================================
RCS file: /cvsroot/squid/squid/src/ftp.c,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- squid/src/ftp.c	1 Apr 2007 14:17:50 -0000	1.347
+++ squid/src/ftp.c	13 Aug 2007 02:39:27 -0000	1.348
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.c,v 1.347 2007/04/01 14:17:50 serassio Exp $
+ * $Id: ftp.c,v 1.348 2007/08/13 02:39:27 hno Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1683,6 +1683,7 @@
 	ftpUnhack(ftpState);
     } else if (code < 0) {
 	ftpFail(ftpState);
+	return;
     }
     ftpSendSize(ftpState);
 }
@@ -1719,6 +1720,7 @@
 	}
     } else if (code < 0) {
 	ftpFail(ftpState);
+	return;
     }
     ftpSendPasv(ftpState);
 }