From 87a122b0dd6dd8e1f9c7b60d7d2932c406c87103 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 3 Jun 2013 22:21:48 -0600 Subject: [PATCH] Fix NULL-dereference added in rev.12779 With the change of helper responses from Notes to NotePairs the errNote in NTLM ERR/NA responses was altered to a potentially NULL char*, and allowed to be printed in debugs() level 4. This updated NTLM and Negotiate halpers to print the helper response as "Result: ..." in identical fashion. Detected by Coverity Scan. Issue 1020655. --- src/auth/negotiate/UserRequest.cc | 4 ++-- src/auth/ntlm/UserRequest.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc index 3ffc04dbb6..2115841ade 100644 --- a/src/auth/negotiate/UserRequest.cc +++ b/src/auth/negotiate/UserRequest.cc @@ -319,7 +319,7 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, const HelperReply &reply) if (tokenNote != NULL) lm_request->server_blob = xstrdup(tokenNote); lm_request->releaseAuthServer(); - debugs(29, 4, HERE << "Failed validating user via Negotiate. Error returned '" << reply << "'"); + debugs(29, 4, "Failed validating user via Negotiate. Result: " << reply); } break; @@ -343,7 +343,7 @@ Auth::Negotiate::UserRequest::HandleReply(void *data, const HelperReply &reply) auth_user_request->user()->credentials(Auth::Failed); safe_free(lm_request->server_blob); lm_request->releaseAuthServer(); - debugs(29, DBG_IMPORTANT, "ERROR: Negotiate Authentication validating user. Error returned " << reply); + debugs(29, DBG_IMPORTANT, "ERROR: Negotiate Authentication validating user. Result: " << reply); } // break; } diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc index c4297dde08..a7516be83a 100644 --- a/src/auth/ntlm/UserRequest.cc +++ b/src/auth/ntlm/UserRequest.cc @@ -301,7 +301,7 @@ Auth::Ntlm::UserRequest::HandleReply(void *data, const HelperReply &reply) auth_user_request->user()->credentials(Auth::Failed); safe_free(lm_request->server_blob); lm_request->releaseAuthServer(); - debugs(29, 4, HERE << "Failed validating user via NTLM. Error returned '" << errNote << "'"); + debugs(29, 4, "Failed validating user via NTLM. Result: " << reply); } break; @@ -325,7 +325,7 @@ Auth::Ntlm::UserRequest::HandleReply(void *data, const HelperReply &reply) auth_user_request->user()->credentials(Auth::Failed); safe_free(lm_request->server_blob); lm_request->releaseAuthServer(); - debugs(29, DBG_IMPORTANT, "ERROR: NTLM Authentication validating user. Error returned '" << reply << "'"); + debugs(29, DBG_IMPORTANT, "ERROR: NTLM Authentication validating user. Result: " << reply); } break; } -- 2.47.3