From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 27 Feb 2012 09:57:02 +0000 (-0700)
Subject: Bug 3490: Crash writing Apache Common logs
X-Git-Tag: BumpSslServerFirst.take05~2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=773003d351a7cf018c5a49c9c156004dfc976050;p=thirdparty%2Fsquid.git

Bug 3490: Crash writing Apache Common logs
---

diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc
index 573c82bcb9..67374ae212 100644
--- a/src/log/FormatHttpdCombined.cc
+++ b/src/log/FormatHttpdCombined.cc
@@ -48,11 +48,17 @@ Log::Format::HttpdCombined(AccessLogEntry * al, Logfile * logfile)
 
     const char *user_auth = ::Format::QuoteUrlEncodeUsername(al->cache.authuser);
 
-    const char *referer = al->request->header.getStr(HDR_REFERER);
+    const char *referer = NULL;
+    const char *agent = NULL;
+
+    if (al && al->request) {
+        referer = al->request->header.getStr(HDR_REFERER);
+        agent = al->request->header.getStr(HDR_USER_AGENT);
+    }
+
     if (!referer || *referer == '\0')
         referer = "-";
 
-    const char *agent = al->request->header.getStr(HDR_USER_AGENT);
     if (!agent || *agent == '\0')
         agent = "-";