Bug 3490: Crash writing Apache Common logs

diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc
index 573c82bcb9bb70bf29dc6afe748228800370c369..67374ae21264b4cc6949608694f9569978c7d1eb 100644 (file)
--- 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 = "-";