From 3a62674582c4163010aa44babce47a8b8e8b6537 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 11 Mar 2011 15:25:58 +0100 Subject: [PATCH] Fix some memory leaks. --- src/ChangeLog | 6 ++++++ src/ftp-ls.c | 17 +++++++++-------- src/ftp.c | 16 +++++++++++++--- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 28aa1a59..44800fe2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-03-11 Giuseppe Scrivano + + * ftp.c (getftp): Fix some memory leaks. + * ftp-ls.c (ftp_parse_winnt_ls): Likewise. + Reported by: Zhenbo Xu . + 2010-11-20 Filipe Brandenburger (tiny change) * http.c (gethttp): Repeat a POST request on a 307 response. diff --git a/src/ftp-ls.c b/src/ftp-ls.c index 2ff57cc0..40c11f39 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -455,7 +455,7 @@ ftp_parse_winnt_ls (const char *file) column 39 of the listing. This way we could also recognize filenames that begin with a series of space characters (but who really wants to use such filenames anyway?). */ - if (len < 40) continue; + if (len < 40) goto continue_loop; tok = line + 39; cur.name = xstrdup(tok); DEBUGP (("Name: '%s'\n", cur.name)); @@ -463,14 +463,14 @@ ftp_parse_winnt_ls (const char *file) /* First column: mm-dd-yy. Should atoi() on the month fail, january will be assumed. */ tok = strtok(line, "-"); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; month = atoi(tok) - 1; if (month < 0) month = 0; tok = strtok(NULL, "-"); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; day = atoi(tok); tok = strtok(NULL, " "); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; year = atoi(tok); /* Assuming the epoch starting at 1.1.1970 */ if (year <= 70) year += 100; @@ -478,10 +478,10 @@ ftp_parse_winnt_ls (const char *file) /* Second column: hh:mm[AP]M, listing does not contain value for seconds */ tok = strtok(NULL, ":"); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; hour = atoi(tok); tok = strtok(NULL, "M"); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; min = atoi(tok); /* Adjust hour from AM/PM. Just for the record, the sequence goes 11:00AM, 12:00PM, 01:00PM ... 11:00PM, 12:00AM, 01:00AM . */ @@ -512,9 +512,9 @@ ftp_parse_winnt_ls (const char *file) directories as the listing does not give us a clue) and filetype here. */ tok = strtok(NULL, " "); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; while ((tok != NULL) && (*tok == '\0')) tok = strtok(NULL, " "); - if (tok == NULL) continue; + if (tok == NULL) goto continue_loop; if (*tok == '<') { cur.type = FT_DIRECTORY; @@ -554,6 +554,7 @@ ftp_parse_winnt_ls (const char *file) l->next = NULL; } +continue_loop: xfree (line); } diff --git a/src/ftp.c b/src/ftp.c index 2cc341bd..9e4f3d76 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -301,10 +301,20 @@ getftp (struct url *u, wgint passed_expected_bytes, wgint *qtyread, csock = connect_to_host (host, port); if (csock == E_HOST) - return HOSTERR; + { + if (con->proxy) + xfree (logname); + + return HOSTERR; + } else if (csock < 0) - return (retryable_socket_connect_error (errno) - ? CONERROR : CONIMPOSSIBLE); + { + if (con->proxy) + xfree (logname); + + return (retryable_socket_connect_error (errno) + ? CONERROR : CONIMPOSSIBLE); + } if (cmd & LEAVE_PENDING) con->csock = csock; -- 2.39.2