Commit e81bdab1 authored by Marc Hoersken's avatar Marc Hoersken
Browse files

socks_sspi.c: added pointer guards to FreeContextBuffer calls 

The FreeContextBuffer SAL declaration does not declare the pointer
as optional, therefore it must not be NULL.
parent 54df6167

lib/socks_sspi.c

+36 −17
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
      Curl_safefree(service_name);

      s_pSecFn->FreeCredentialsHandle(&cred_handle);

      s_pSecFn->DeleteSecurityContext(&sspi_context);

      if(sspi_recv_token.pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);

      failf(data, "Failed to initialise security context.");

      return CURLE_COULDNT_CONNECT;
@@ -209,7 +210,9 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
      if((code != CURLE_OK) || (4 != written)) {

        failf(data, "Failed to send SSPI authentication request.");

        Curl_safefree(service_name);

        if(sspi_send_token.pvBuffer)

          s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);

        if(sspi_recv_token.pvBuffer)

          s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);

        s_pSecFn->FreeCredentialsHandle(&cred_handle);

        s_pSecFn->DeleteSecurityContext(&sspi_context);
@@ -221,7 +224,9 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
      if((code != CURLE_OK) || (sspi_send_token.cbBuffer != (size_t)written)) {

        failf(data, "Failed to send SSPI authentication token.");

        Curl_safefree(service_name);

        if(sspi_send_token.pvBuffer)

          s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);

        if(sspi_recv_token.pvBuffer)

          s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);

        s_pSecFn->FreeCredentialsHandle(&cred_handle);

        s_pSecFn->DeleteSecurityContext(&sspi_context);
@@ -230,12 +235,18 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 


    }



    if(sspi_send_token.pvBuffer) {

      s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);

      sspi_send_token.pvBuffer = NULL;

    }

    sspi_send_token.cbBuffer = 0;



    if(sspi_recv_token.pvBuffer) {

      s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);

      sspi_recv_token.pvBuffer = NULL;

    }

    sspi_recv_token.cbBuffer = 0;



    if(status != SEC_I_CONTINUE_NEEDED)

      break;
@@ -295,6 +306,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
    if(result != CURLE_OK || actualread != us_length) {

      failf(data, "Failed to receive SSPI authentication token.");

      Curl_safefree(service_name);

      if(sspi_recv_token.pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_recv_token.pvBuffer);

      s_pSecFn->FreeCredentialsHandle(&cred_handle);

      s_pSecFn->DeleteSecurityContext(&sspi_context);
@@ -459,6 +471,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
  code = Curl_write_plain(conn, sock, (char *)socksreq, 4, &written);

  if((code != CURLE_OK) || (4 != written)) {

    failf(data, "Failed to send SSPI encryption request.");

    if(sspi_send_token.pvBuffer)

      s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);

    s_pSecFn->DeleteSecurityContext(&sspi_context);

    return CURLE_COULDNT_CONNECT;
@@ -478,10 +491,12 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
                            sspi_send_token.cbBuffer, &written);

    if((code != CURLE_OK) || (sspi_send_token.cbBuffer != (size_t)written)) {

      failf(data, "Failed to send SSPI encryption type.");

      if(sspi_send_token.pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);

      s_pSecFn->DeleteSecurityContext(&sspi_context);

      return CURLE_COULDNT_CONNECT;

    }

    if(sspi_send_token.pvBuffer)

      s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);

  }
@@ -541,7 +556,9 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
                                      &qop);



    if(check_sspi_err(conn, status, "DecryptMessage")) {

      if(sspi_w_token[0].pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_w_token[0].pvBuffer);

      if(sspi_w_token[1].pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_w_token[1].pvBuffer);

      s_pSecFn->DeleteSecurityContext(&sspi_context);

      failf(data, "Failed to query security context attributes.");
@@ -551,7 +568,9 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, 
    if(sspi_w_token[1].cbBuffer != 1) {

      failf(data, "Invalid SSPI encryption response length (%lu).",

            (unsigned long)sspi_w_token[1].cbBuffer);

      if(sspi_w_token[0].pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_w_token[0].pvBuffer);

      if(sspi_w_token[1].pvBuffer)

        s_pSecFn->FreeContextBuffer(sspi_w_token[1].pvBuffer);

      s_pSecFn->DeleteSecurityContext(&sspi_context);

      return CURLE_COULDNT_CONNECT;