From: wessels <>
Date: Wed, 5 May 1999 03:08:40 +0000 (+0000)
Subject: accessing request->user_ident was unguarded.  It should be moved inside
X-Git-Tag: SQUID_3_0_PRE1~2216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acb3fd092cf130576083913cb03ffe1f35a46cc6;p=thirdparty%2Fsquid.git

accessing request->user_ident was unguarded.  It should be moved inside
the if (request) statement
Luyer
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 138f883b6e..24c93aebd0 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side.cc,v 1.450 1999/05/04 19:22:23 wessels Exp $
+ * $Id: client_side.cc,v 1.451 1999/05/04 21:08:40 wessels Exp $
  *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
@@ -655,10 +655,6 @@ httpRequestFree(void *data)
 	http->al.cache.size = http->out.size;
 	http->al.cache.code = http->log_type;
 	http->al.cache.msec = tvSubMsec(http->start, current_time);
-	if (request->user_ident[0])
-	    http->al.cache.ident = request->user_ident;
-	else
-	    http->al.cache.ident = conn->ident;
 	if (request) {
 	    Packer p;
 	    MemBuf mb;
@@ -669,6 +665,10 @@ httpRequestFree(void *data)
 	    http->al.http.version = request->http_ver;
 	    http->al.headers.request = xstrdup(mb.buf);
 	    http->al.hier = request->hier;
+	    if (request->user_ident[0])
+		http->al.cache.ident = request->user_ident;
+	    else
+		http->al.cache.ident = conn->ident;
 	    packerClean(&p);
 	    memBufClean(&mb);
 	}