moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

- Benbuck Nason posted the bug report #2835196

Browse Source 
(http://curl.haxx.se/bug/view.cgi?id=2835196), fixing a few compiler
  warnings when mixing ints and bools.
This commit is contained in:
Daniel Stenberg 2009-08-11 20:43:12 +00:00
parent 33368ebd02
commit 171eef68c3
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -6,6 +6,11 @@
Changelog Changelog
Daniel Stenberg (11 Aug 2009)
- Benbuck Nason posted the bug report #2835196
(http://curl.haxx.se/bug/view.cgi?id=2835196), fixing a few compiler
warnings when mixing ints and bools.
Daniel Fandrich (10 Aug 2009) Daniel Fandrich (10 Aug 2009)
- Fixed a memory leak in the FTP code and an off-by-one heap buffer overflow. - Fixed a memory leak in the FTP code and an off-by-one heap buffer overflow.

4
lib/ftp.c
View File

@ -3529,7 +3529,7 @@ static CURLcode ftp_nextconnect(struct connectdata *conn)
/* But only if a body transfer was requested. */ /* But only if a body transfer was requested. */
if(ftp->transfer == FTPTRANSFER_BODY) { if(ftp->transfer == FTPTRANSFER_BODY) {
result = ftp_nb_type(conn, 1, FTP_LIST_TYPE); result = ftp_nb_type(conn, TRUE, FTP_LIST_TYPE);
if(result) if(result)
return result; return result;
} }
@ -4093,7 +4093,7 @@ CURLcode ftp_regular_transfer(struct connectdata *conn,
bool *dophase_done) bool *dophase_done)
{ {
CURLcode result=CURLE_OK; CURLcode result=CURLE_OK;
bool connected=0; bool connected=FALSE;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct ftp_conn *ftpc = &conn->proto.ftpc; struct ftp_conn *ftpc = &conn->proto.ftpc;
data->req.size = -1; /* make sure this is unknown at this point */ data->req.size = -1; /* make sure this is unknown at this point */

4
lib/url.c
View File

@ -3862,7 +3862,7 @@ static CURLcode parse_url_userpass(struct SessionHandle *data,
if(data->set.use_netrc != CURL_NETRC_REQUIRED) { if(data->set.use_netrc != CURL_NETRC_REQUIRED) {
/* We could use the one in the URL */ /* We could use the one in the URL */
conn->bits.user_passwd = 1; /* enable user+password */ conn->bits.user_passwd = TRUE; /* enable user+password */
if(*userpass != ':') { if(*userpass != ':') {
/* the name is given, get user+password */ /* the name is given, get user+password */
@ -4027,7 +4027,7 @@ static void override_userpass(struct SessionHandle *data,
different host or similar. */ different host or similar. */
conn->bits.netrc = TRUE; conn->bits.netrc = TRUE;
conn->bits.user_passwd = 1; /* enable user+password */ conn->bits.user_passwd = TRUE; /* enable user+password */
} }
} }
} }