From db543dc986a3f92b775ff5f168525eb6ee14f898 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 20 Feb 2012 01:56:41 -0700 Subject: [PATCH] Bug 3490: Crash writing Referer/Username logs --- src/log/FormatSquidReferer.cc | 4 ++++ src/log/FormatSquidUseragent.cc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/log/FormatSquidReferer.cc b/src/log/FormatSquidReferer.cc index 16f8b3d17b..a498af9b49 100644 --- a/src/log/FormatSquidReferer.cc +++ b/src/log/FormatSquidReferer.cc @@ -43,6 +43,10 @@ void Log::Format::SquidReferer(AccessLogEntry *al, Logfile *logfile) { + // do not log unless there is something to be displayed + if (!al || !al->request) + return; + const char *referer = al->request->header.getStr(HDR_REFERER); // do not log unless there is something to be displayed diff --git a/src/log/FormatSquidUseragent.cc b/src/log/FormatSquidUseragent.cc index 9eb825006f..470629e1f4 100644 --- a/src/log/FormatSquidUseragent.cc +++ b/src/log/FormatSquidUseragent.cc @@ -43,6 +43,10 @@ void Log::Format::SquidUserAgent(AccessLogEntry * al, Logfile * logfile) { + // do not log unless there is something to be displayed. + if (!al || !al->request) + return; + const char *agent = al->request->header.getStr(HDR_USER_AGENT); // do not log unless there is something to be displayed. -- 2.47.2