--------------------- PatchSet 1415 Date: 2001/01/29 10:16:15 Author: rbcollins Branch: auth_rewrite Tag: (none) Log: NULL pointer chasing bug Members: src/acl.c:1.1.1.3.12.26.2.37->1.1.1.3.12.26.2.38 src/authenticate.c:1.1.1.3.12.17.2.33->1.1.1.3.12.17.2.34 Index: squid/src/acl.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/acl.c,v retrieving revision 1.1.1.3.12.26.2.37 retrieving revision 1.1.1.3.12.26.2.38 diff -u -r1.1.1.3.12.26.2.37 -r1.1.1.3.12.26.2.38 --- squid/src/acl.c 23 Jan 2001 10:14:19 -0000 1.1.1.3.12.26.2.37 +++ squid/src/acl.c 29 Jan 2001 10:16:15 -0000 1.1.1.3.12.26.2.38 @@ -1,6 +1,6 @@ /* - * $Id: acl.c,v 1.1.1.3.12.26.2.37 2001/01/23 10:14:19 rbcollins Exp $ + * $Id: acl.c,v 1.1.1.3.12.26.2.38 2001/01/29 10:16:15 rbcollins Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -1216,7 +1216,7 @@ if (!authenticateValidateUser(auth_user_request = authenticateGetAuthUser(proxy_auth))) { /* the decode might have left a username for logging, or a message to * the user */ - if (auth_user_request) { + if (authenticateUserRequestUsername(auth_user_request)) { /* lock the user for the request structure link */ authenticateAuthUserRequestLock(auth_user_request); checklist->request->auth_user_request = auth_user_request; Index: squid/src/authenticate.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/authenticate.c,v retrieving revision 1.1.1.3.12.17.2.33 retrieving revision 1.1.1.3.12.17.2.34 diff -u -r1.1.1.3.12.17.2.33 -r1.1.1.3.12.17.2.34 --- squid/src/authenticate.c 23 Jan 2001 13:12:59 -0000 1.1.1.3.12.17.2.33 +++ squid/src/authenticate.c 29 Jan 2001 10:16:15 -0000 1.1.1.3.12.17.2.34 @@ -1,6 +1,6 @@ /* - * $Id: authenticate.c,v 1.1.1.3.12.17.2.33 2001/01/23 13:12:59 rbcollins Exp $ + * $Id: authenticate.c,v 1.1.1.3.12.17.2.34 2001/01/29 10:16:15 rbcollins Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Duane Wessels @@ -324,7 +324,10 @@ authenticateUserRequestUsername(auth_user_request_t * auth_user_request) { assert(auth_user_request != NULL); - return authenticateUserUsername(auth_user_request->auth_user); + if (auth_user_request->auth_user) + return authenticateUserUsername(auth_user_request->auth_user); + else + return NULL; } /* returns