From 29350b363b5b230865b800a4980762592694971b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 4 Feb 2005 23:43:44 +0000 Subject: [PATCH] Eric Vergnaud found a use of an uninitialized variable --- CHANGES | 7 +++++++ lib/ftp.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 901f077bb..764b3467f 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,13 @@ Changelog +Daniel (5 February 2005) +- Eric Vergnaud found a use of an uninitialised variable in the ftp when doing + PORT on ipv6-enabled hosts. + +- David Byron pointed out we could use BUFSIZE to read data (in + lib/transfer.c) instead of using BUFSIZE -1. + Version 7.13.0 (1 February 2005) Daniel (31 January 2005) diff --git a/lib/ftp.c b/lib/ftp.c index e6d2cdfae..ddbd4968f 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -1127,7 +1127,7 @@ CURLcode ftp_use_port(struct connectdata *conn) * */ - struct addrinfo hints, *res, *ai; + struct addrinfo *res, *ai; struct sockaddr_storage ss; socklen_t sslen; char hbuf[NI_MAXHOST]=""; @@ -1190,7 +1190,7 @@ CURLcode ftp_use_port(struct connectdata *conn) * Workaround for AIX5 getaddrinfo() problem (it doesn't set ai_socktype): */ if (ai->ai_socktype == 0) - ai->ai_socktype = hints.ai_socktype; + ai->ai_socktype = SOCK_STREAM; portsock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); if (portsock == CURL_SOCKET_BAD) {