Fixed some compiler warnings. Fixed a low incidence memory leak in the test server.

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index 68f76991338b7af7aa0d38d490ede87ef7ef1976..bfcef84ac6385b45954e9c6df3a79bae7bee0307 100644 (file)
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -166,7 +166,7 @@ int Curl_input_negotiate(struct connectdata *conn, char *header)
 
   len = strlen(header);
   if (len > 0) {
-    int rawlen = Curl_base64_decode(header, &input_token.value);
+    int rawlen = Curl_base64_decode(header, (unsigned char **)&input_token.value);
     if (rawlen < 0)
       return -1;
     input_token.length = rawlen;
@@ -206,7 +206,7 @@ int Curl_input_negotiate(struct connectdata *conn, char *header)
           input_token.length = mechTokenLength;
           free(mechToken);
           mechToken = NULL;
-          infof(conn->data, "Parse SPNEGO Target Token succeded\n");
+          infof(conn->data, "Parse SPNEGO Target Token succeeded\n");
         }
     }
 #endif
@@ -287,7 +287,7 @@ CURLcode Curl_output_negotiate(struct connectdata *conn)
       neg_ctx->output_token.length = spnegoTokenLength;
       free(spnegoToken);
       spnegoToken = NULL;
-      infof(conn->data, "Make SPNEGO Initial Token succeded\n");
+      infof(conn->data, "Make SPNEGO Initial Token succeeded\n");
     }
   }
 #endif

diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index fa0f9cf527ef0c1a18e33f3e4bdda1c44426e3c5..caa1c32a7d1c54ddfbaa09372ddc16c1f6c08ee9 100644 (file)
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -61,11 +61,11 @@ char *appendstring(char *string, /* original string */
 {
   size_t len = strlen(buffer);
   size_t needed_len = len + *stringlen + 1;
-  unsigned char *buf64=NULL;
+  char *buf64=NULL;
 
   if(base64) {
     /* decode the given buffer first */
-    len = Curl_base64_decode(buffer, &buf64); /* updated len */
+    len = Curl_base64_decode(buffer, (unsigned char**)&buf64); /* updated len */
     buffer = buf64;
     needed_len = len + *stringlen + 1; /* recalculate */
   }
@@ -79,8 +79,11 @@ char *appendstring(char *string, /* original string */
       string = newptr;
       *stralloc = newsize;
     }
-    else
+    else {
+      if(buf64)
+        free(buf64);
       return NULL;
+    }
   }
   /* memcpy to support binary blobs */
   memcpy(&string[*stringlen], buffer, len);