Commit 0dec3e5e authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed a memory leak in the FTP code and an off-by-one heap buffer overflow.

parent 66f5baa1

CHANGES

+3 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,9 @@ 




                                  Changelog

                                  Changelog





Daniel Fandrich (10 Aug 2009)

- Fixed a memory leak in the FTP code and an off-by-one heap buffer overflow.



Daniel Fandrich (9 Aug 2009)

Daniel Fandrich (9 Aug 2009)

- Fixed some memory leaks in the command-line tool that caused most of the

- Fixed some memory leaks in the command-line tool that caused most of the

  torture tests to fail.

  torture tests to fail.

lib/ftp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -926,9 +926,9 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, 
    char *port_start = NULL;

    char *port_start = NULL;

    char *port_sep = NULL;

    char *port_sep = NULL;





    addr = malloc(addrlen);

    addr = calloc(addrlen+1, 1);

    memset(addr, 0, addrlen);

    if (!addr)



      return CURLE_OUT_OF_MEMORY;





#ifdef ENABLE_IPV6

#ifdef ENABLE_IPV6

    if(*string_ftpport == '[') {

    if(*string_ftpport == '[') {