Fix memory leak

1 files changed, 25 insertions, 18 deletions

diff --git a/libressl.patch b/libressl.patch
index 4953f41..bfd3d20 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -102,7 +102,7 @@ index 9f1dd67ec..60e1afe99 100644
  static void tls_xwrite(tls_state_t *tls, int len)
  {
 diff --git a/networking/wget.c b/networking/wget.c
-index 6a64836fb..831bc4023 100644
+index 6a64836fb..ad352586e 100644
 --- a/networking/wget.c
 +++ b/networking/wget.c
 @@ -1,4 +1,3 @@
@@ -120,7 +120,7 @@ index 6a64836fb..831bc4023 100644
  #if ENABLE_FEATURE_WGET_TIMEOUT
         unsigned timeout_seconds;
         smallint die_if_timed_out;
-@@ -460,6 +462,67 @@ static FILE *open_socket(len_and_sockaddr *lsa)
+@@ -460,6 +462,68 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         return fp;
  }
  
@@ -182,13 +182,14 @@ index 6a64836fb..831bc4023 100644
 +       tls_config_set_ca_mem(cfg, pemmem, pemsize);
 +       fclose(pemfile);
 +       DeleteFileA(tmpfilename);
++       return pemmem;
 +}
 +#endif
 +
  /* We balk at any control chars in other side's messages.
   * This prevents nasty surprises (e.g. ESC sequences) in "Location:" URLs
   * and error messages.
-@@ -689,6 +752,7 @@ static void reset_beg_range_to_zero(void)
+@@ -689,6 +753,7 @@ static void reset_beg_range_to_zero(void)
  }
  
  #if ENABLE_FEATURE_WGET_OPENSSL
@@ -196,7 +197,7 @@ index 6a64836fb..831bc4023 100644
  static int spawn_https_helper_openssl(const char *host, unsigned port)
  {
         char *allocated = NULL;
-@@ -698,7 +762,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -698,7 +763,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         IF_FEATURE_WGET_HTTPS(volatile int child_failed = 0;)
  
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, sp) != 0)
@@ -205,7 +206,7 @@ index 6a64836fb..831bc4023 100644
                 bb_simple_perror_msg_and_die("socketpair");
  
         if (!strchr(host, ':'))
-@@ -709,18 +773,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -709,18 +774,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
         fflush_all();
         pid = xvfork();
         if (pid == 0) {
@@ -230,7 +231,7 @@ index 6a64836fb..831bc4023 100644
                 xmove_fd(2, 3);
                 xopen("/dev/null", O_RDWR);
                 memset(&argv, 0, sizeof(argv));
-@@ -729,18 +793,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -729,18 +794,18 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
                 argv[2] = (char*)"-quiet";
                 argv[3] = (char*)"-connect";
                 argv[4] = (char*)host;
@@ -255,7 +256,7 @@ index 6a64836fb..831bc4023 100644
                         *argp++ = (char*)"-verify";              //[7]
                         *argp++ = (char*)"100";                  //[8]
                         *argp++ = (char*)"-verify_return_error"; //[9]
-@@ -762,10 +826,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -762,10 +827,10 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # else
                 bb_perror_msg_and_die("can't execute '%s'", argv[0]);
  # endif
@@ -268,7 +269,7 @@ index 6a64836fb..831bc4023 100644
         free(servername);
         free(allocated);
         close(sp[1]);
-@@ -777,6 +841,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
+@@ -777,6 +842,7 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
  # endif
         return sp[0];
  }
@@ -276,7 +277,7 @@ index 6a64836fb..831bc4023 100644
  #endif
  
  #if ENABLE_FEATURE_WGET_HTTPS
-@@ -1151,6 +1216,9 @@ static void download_one_url(const char *url)
+@@ -1151,6 +1217,9 @@ static void download_one_url(const char *url)
         server.user = NULL;
         target.user = NULL;
  
@@ -286,7 +287,7 @@ index 6a64836fb..831bc4023 100644
         parse_url(url, &target);
  
         /* Use the proxy if necessary */
-@@ -1234,22 +1302,39 @@ static void download_one_url(const char *url)
+@@ -1234,22 +1303,41 @@ static void download_one_url(const char *url)
                         /* openssl-based helper
                          * Inconvenient API since we can't give it an open fd
                          */
@@ -298,7 +299,8 @@ index 6a64836fb..831bc4023 100644
 -                               spawn_ssl_client(server.host, fileno(sfp), /*flags*/ 0);
 -                               goto socket_opened;
 -                       }
-+                       char *allocated, *servername, *host, *pemmem;
++                       printf("Into section where we config everything\n");
++                       char *allocated, *servername, *host;
 +                       if(!strchr(server.host, ':'))
 +                               host = allocated = xasprintf("%s:%u", server.host, server.port);
 +                       servername = xstrdup(host);
@@ -329,6 +331,7 @@ index 6a64836fb..831bc4023 100644
 +                       //sfp = fdopen(fd, "r+");
 +                       //if (!sfp)
 +                       //      bb_die_memory_exhausted();
++                       printf("Got socket!\n");
                         goto socket_opened;
                 }
 -               sfp = open_socket(lsa);
@@ -336,12 +339,13 @@ index 6a64836fb..831bc4023 100644
   socket_opened:
  #elif ENABLE_FEATURE_WGET_HTTPS
                 /* Only internal TLS support is configured */
-@@ -1353,7 +1438,39 @@ static void download_one_url(const char *url)
+@@ -1353,7 +1441,41 @@ static void download_one_url(const char *url)
                         shutdown(fileno(sfp), SHUT_WR);
                 }
  #endif
 -
 +               //How much data did we actually get?
++               printf("Got to in/out exchange\n");
 +               size_t wlen, bufsize;
 +               wlen = ftell(sfp);
 +               if(wlen < 0)
@@ -374,19 +378,22 @@ index 6a64836fb..831bc4023 100644
 +                       bb_error_msg_and_die("tls read error: %s", tls_error(ctx));
 +               rewind(dfp);
 +               sfp = dfp;
++               printf("finished in/out exchange\n");
                 /*
                  * Retrieve HTTP response line and check for "200" status code.
                  */
-@@ -1536,6 +1653,8 @@ However, in real world it was observed that some web servers
+@@ -1536,6 +1658,10 @@ However, in real world it was observed that some web servers
                 /* ftpcmd("QUIT", NULL, sfp); - why bother? */
         }
  #endif
++       printf("About to clean up connection\n");
 +       if(ctx != NULL)
 +               tls_close(ctx);
++       printf("Cleaned up connection\n");
         fclose(sfp);
  
         free(server.allocated);
-@@ -1690,10 +1809,18 @@ IF_DESKTOP(     "no-parent\0"        No_argument       "\xf0")
+@@ -1690,9 +1816,18 @@ IF_DESKTOP(      "no-parent\0"        No_argument       "\xf0")
                         xdup2(G.log_fd, STDERR_FILENO);
                 }
         }
@@ -399,14 +406,14 @@ index 6a64836fb..831bc4023 100644
 +       printf("Got to downloading section\n");
         while (*argv)
                 download_one_url(*argv++);
- 
++       printf("Finished downloading section\n");
 +       free(pemmem);
 +       tls_config_free(G.tlscfg);
-+
++       printf("Freed everythign\n");
+ 
         if (G.output_fd >= 0)
                 xclose(G.output_fd);
- 
-@@ -1704,6 +1831,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
+@@ -1704,6 +1839,6 @@ IF_DESKTOP(       "no-parent\0"        No_argument       "\xf0")
         free(G.extra_headers);
  #endif
         FINI_G();