1 files changed, 13 insertions, 7 deletions

diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/mhds_get_test.c
index 302c6e9a..9b2f9519 100644
--- a/src/testcurl/https/mhds_get_test.c
+++ b/src/testcurl/https/mhds_get_test.c
@@ -147,22 +147,19 @@ test_daemon_get (FILE * test_fd, char *cipher_suite, int proto_version)
   doc_path_len = PATH_MAX > 4096 ? 4096 : PATH_MAX;
   if (NULL == (doc_path = malloc (doc_path_len)))
     {
-      fclose (test_fd);
       fprintf (stderr, MHD_E_MEM);
       return -1;
     }
   if (getcwd (doc_path, doc_path_len) == NULL)
     {
-      fclose (test_fd);
-      free (doc_path);
       fprintf (stderr, "Error: failed to get working directory. %s\n",
                strerror (errno));
+      free (doc_path);
       return -1;
     }
 
   if (NULL == (mem_test_file_local = malloc (len)))
     {
-      fclose (test_fd);
       fprintf (stderr, MHD_E_MEM);
       return -1;
     }
@@ -170,15 +167,17 @@ test_daemon_get (FILE * test_fd, char *cipher_suite, int proto_version)
   fseek (test_fd, 0, SEEK_SET);
   if (fread (mem_test_file_local, sizeof (char), len, test_fd) != len)
     {
-      fclose (test_fd);
+      free (mem_test_file_local);
+      free (doc_path);
       fprintf (stderr, "Error: failed to read test file. %s\n",
                strerror (errno));
       return -1;
     }
 
-  if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
+  if (NULL == (cbc.buf = malloc (len)))
     {
-      fclose (test_fd);
+      free (mem_test_file_local);
+      free (doc_path);
       fprintf (stderr, MHD_E_MEM);
       return -1;
     }
@@ -219,6 +218,9 @@ test_daemon_get (FILE * test_fd, char *cipher_suite, int proto_version)
       fprintf (stderr, "curl_easy_perform failed: `%s'\n",
                curl_easy_strerror (errornum));
       curl_easy_cleanup (c);
+      free (mem_test_file_local);
+      free (doc_path);
+      free (cbc.buf);
       return errornum;
     }
 
@@ -229,6 +231,7 @@ test_daemon_get (FILE * test_fd, char *cipher_suite, int proto_version)
       fprintf (stderr, "Error: local file & received file differ.\n");
       free (cbc.buf);
       free (mem_test_file_local);
+      free (doc_path);
       return -1;
     }
 
@@ -281,12 +284,14 @@ setupTestFile ()
     {
       fprintf (stderr, "Error: failed to write `%s. %s'\n",
                test_file_name, strerror (errno));
+      fclose (test_fd);
       return NULL;
     }
   if (fflush (test_fd))
     {
       fprintf (stderr, "Error: failed to flush test file stream. %s\n",
                strerror (errno));
+      fclose (test_fd);
       return NULL;
     }
 
@@ -341,6 +346,7 @@ main (int argc, char *const *argv)
   if (0 != curl_global_init (CURL_GLOBAL_ALL))
     {
       fprintf (stderr, "Error: %s\n", strerror (errno));
+      fclose (test_fd);
       return -1;
     }