From: hno <>
Date: Sun, 6 Nov 2005 19:59:06 +0000 (+0000)
Subject: assertion failed: cbdata.cc:450: "c->locks > 0"
X-Git-Tag: SQUID_3_0_PRE4~539
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6151f510476e196b458ff6b58249f9643303632;p=thirdparty%2Fsquid.git

assertion failed: cbdata.cc:450: "c->locks > 0"
if ntlm/negotiate auth helper crashes.
---

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index d8eedb3be7..6b95345ac5 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_negotiate.cc,v 1.3 2005/10/28 18:32:17 serassio Exp $
+ * $Id: auth_negotiate.cc,v 1.4 2005/11/06 12:59:06 hno Exp $
  *
  * DEBUG: section 29    Negotiate Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -384,7 +384,7 @@ authenticateNegotiateHandleReply(void *data, void *lastserver, char *reply)
     AuthNegotiateUserRequest *negotiate_request;
 
     debug(29, 8) ("authenticateNegotiateHandleReply: helper: '%p' sent us '%s'\n", lastserver, reply ? reply : "<NULL>");
-    valid = cbdataReferenceValid(data);
+    valid = cbdataReferenceValid(r->data);
 
     if (!valid) {
         debug(29, 1) ("authenticateNegotiateHandleReply: invalid callback data. Releasing helper '%p'.\n", lastserver);
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index b81ad45490..e9183fc9fc 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: auth_ntlm.cc,v 1.51 2005/10/28 18:32:17 serassio Exp $
+ * $Id: auth_ntlm.cc,v 1.52 2005/11/06 12:59:07 hno Exp $
  *
  * DEBUG: section 29    NTLM Authenticator
  * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli
@@ -352,7 +352,7 @@ authenticateNTLMHandleReply(void *data, void *lastserver, char *reply)
     AuthNTLMUserRequest *ntlm_request;
 
     debug(29, 8) ("authenticateNTLMHandleReply: helper: '%p' sent us '%s'\n", lastserver, reply ? reply : "<NULL>");
-    valid = cbdataReferenceValid(data);
+    valid = cbdataReferenceValid(r->data);
 
     if (!valid) {
         debug(29, 1) ("authenticateNTLMHandleReply: invalid callback data. Releasing helper '%p'.\n", lastserver);