Changelog
+Daniel Fandrich (11 Aug 2008)
+- Fixed a boundary condition error in ftp_readresp() whereby a non-terminal
+ line of a multiline FTP response whose last byte landed exactly at the end
+ of the BUFSIZE-length buffer would be treated as the terminal response
+ line. The following response code read in would then actually be the
+ end of the previous response line, and all responses from then on would
+ correspond to the wrong command. Test case 1062 verifies this.
+
+- Stop closing a never-opened ftp socket.
+
Daniel Stenberg (11 Aug 2008)
- Constantine Sapuntzakis filed bug report #2042430
(http://curl.haxx.se/bug/view.cgi?id=2042430) with a patch. "NTLM Windows
ssize_t gotbytes;
char *ptr;
struct SessionHandle *data = conn->data;
- char *buf = data->state.buffer;
+ char * const buf = data->state.buffer;
CURLcode result = CURLE_OK;
struct ftp_conn *ftpc = &conn->proto.ftpc;
int code = 0;
* int to begin with, even though its datatype may be larger
* than an int.
*/
+ DEBUGASSERT((ptr+ftpc->cache_size) <= (buf+BUFSIZE+1));
memcpy(ptr, ftpc->cache, (int)ftpc->cache_size);
gotbytes = (int)ftpc->cache_size;
free(ftpc->cache); /* free the cache */
conn->data_prot = 0;
#endif
+ DEBUGASSERT((ptr+BUFSIZE-ftpc->nread_resp) <= (buf+BUFSIZE+1));
res = Curl_read(conn, sockfd, ptr, BUFSIZE-ftpc->nread_resp,
&gotbytes);
#if defined(HAVE_KRB4) || defined(HAVE_GSSAPI)
dash or a space and it is significant */
clipamount = 4;
}
- else if(perline && (ftpc->nread_resp > BUFSIZE/2)) {
- /* We got a large chunk of data and there's still trailing data to
- take care of, so we put that part in the "cache" and restart */
+ else if(ftpc->nread_resp > BUFSIZE/2) {
+ /* We got a large chunk of data and there's potentially still trailing
+ data to take care of, so we put any such part in the "cache", clear
+ the buffer to make space and restart. */
clipamount = perline;
restart = TRUE;
}
shutdown(conn->sock[SECONDARYSOCKET],2); /* SD_BOTH */
#endif
- if(conn->ssl[SECONDARYSOCKET].use) {
- /* The secondary socket is using SSL so we must close down that part first
- before we close the socket for real */
- Curl_ssl_close(conn, SECONDARYSOCKET);
+ if(conn->sock[SECONDARYSOCKET] != CURL_SOCKET_BAD) {
+ if(conn->ssl[SECONDARYSOCKET].use) {
+ /* The secondary socket is using SSL so we must close down that part first
+ before we close the socket for real */
+ Curl_ssl_close(conn, SECONDARYSOCKET);
- /* Note that we keep "use" set to TRUE since that (next) connection is
- still requested to use SSL */
- }
- sclose(conn->sock[SECONDARYSOCKET]);
+ /* Note that we keep "use" set to TRUE since that (next) connection is
+ still requested to use SSL */
+ }
+ sclose(conn->sock[SECONDARYSOCKET]);
- conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
+ conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
+ }
if((ftp->transfer == FTPTRANSFER_BODY) && !status && !premature) {
/*
projects / curl / commitdiff