Commit 171eef68 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- 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.
parent 33368ebd

CHANGES

+5 −0
Original line number Original line Diff line number Diff line
@@ -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.

lib/ftp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 */

lib/url.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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 */

    }

    }

  }

  }

}

}