From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 16 Oct 2014 19:22:20 +0000 (+0100)
Subject: ntlm: Avoid unnecessary buffer allocation for SSPI based type-2 token
X-Git-Tag: curl-7_39_0~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a91296f1de22eef430734f000fa00978a35930b;p=thirdparty%2Fcurl.git

ntlm: Avoid unnecessary buffer allocation for SSPI based type-2 token
---

diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 0b76827e7d..0c983b781f 100644
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -297,13 +297,8 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
   }
 
 #ifdef USE_WINDOWS_SSPI
-  ntlm->type_2 = malloc(size + 1);
-  if(ntlm->type_2 == NULL) {
-    free(buffer);
-    return CURLE_OUT_OF_MEMORY;
-  }
+  ntlm->type_2 = buffer;
   ntlm->n_type_2 = curlx_uztoul(size);
-  memcpy(ntlm->type_2, buffer, size);
 #else
   ntlm->flags = 0;
 
@@ -336,8 +331,9 @@ CURLcode Curl_ntlm_decode_type2_message(struct SessionHandle *data,
     fprintf(stderr, "\n****\n");
     fprintf(stderr, "**** Header %s\n ", header);
   });
-#endif
+
   free(buffer);
+#endif
 
   return CURLE_OK;
 }
diff --git a/lib/urldata.h b/lib/urldata.h
index e9ddf30b81..900b8c8ad0 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -442,7 +442,7 @@ struct ntlmdata {
   size_t max_token_length;
   BYTE *output_token;
   int has_handles;
-  void *type_2;
+  BYTE *type_2;
   unsigned long n_type_2;
 #else
   unsigned int flags;