Commit 7a91296f authored by Steve Holme's avatar Steve Holme
Browse files

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

parent c927c920

lib/curl_ntlm_msgs.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

}

lib/urldata.h

+1 −1
Original line number Diff line number Diff line
@@ -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;