mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
Fixed some compiler warnings. Fixed a low incidence memory leak in the test server.
This commit is contained in:
parent
5faf52619d
commit
9798432f56
@ -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
|
||||
|
@ -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,9 +79,12 @@ 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);
|
||||
*stringlen += len;
|
||||
|
Loading…
Reference in New Issue
Block a user