4 files changed, 6 insertions, 7 deletions

diff --git a/src/microhttpd/test_postprocessor.c b/src/microhttpd/test_postprocessor.c
index e3a4d4c4..029600a2 100644
--- a/src/microhttpd/test_postprocessor.c
+++ b/src/microhttpd/test_postprocessor.c
@@ -169,9 +169,9 @@ test_multipart_garbage ()
   xdata[1] = 'x';
   xdata[2] = '\r';
   memcpy (&xdata[3], FORM_DATA, size);
-  size += 3;
 
   size = strlen (FORM_DATA);
+  size += 3;
   for (splitpoint = 1; splitpoint < size; splitpoint++)
   {
     want_off = FORM_START;
diff --git a/src/microhttpd/test_upgrade_common.c b/src/microhttpd/test_upgrade_common.c
index f97e5e7c..ee3f699d 100644
--- a/src/microhttpd/test_upgrade_common.c
+++ b/src/microhttpd/test_upgrade_common.c
@@ -205,10 +205,7 @@ recv_hdr (MHD_socket sock)
       if (-1 == ret)
         {
           if (EAGAIN == errno)
-            {
-              ret = 0;
-              continue;
-            }
+            continue;
           abort ();
         }
       if (0 == ret)
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index a71d0e0b..11fa88d5 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -116,7 +116,10 @@ test_query_session ()
                         MHD_OPTION_END);
 
   if (d == NULL)
-    return 2;
+    {
+      free (cbc.buf);
+      return 2;
+    }
 
   const char *aes256_sha = "AES256-SHA";
   if (curl_uses_nss_ssl() == 0)
diff --git a/src/testcurl/test_parse_cookies.c b/src/testcurl/test_parse_cookies.c
index aefaafdf..e953cde0 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -81,7 +81,6 @@ ahc_echo (void *cls,
       return MHD_YES;
     }
   *unused = NULL;
-  ret = 0;
 
   hdr = MHD_lookup_connection_value (connection, MHD_COOKIE_KIND, "name1");
   if ((hdr == NULL) || (0 != strcmp (hdr, "var1")))