From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 15 Sep 2008 15:48:19 +0000 (+1200)
Subject: Compile errors
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~23
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0ae3294ae95165b4e489b19e9dd9d2e7a3e477a8;p=thirdparty%2Fsquid.git

Compile errors
---

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 9e7e1181c9..0cd6b22a98 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -123,7 +123,7 @@ static char **error_text = NULL;
 static int error_page_count = 0;
 
 /// \ingroup ErrorPageInternal
-static MemBuf error_page_stylesheet_content;
+static MemBuf error_stylesheet;
 
 static char *errorTryLoadText(const char *page_name, const char *dir, bool silent = false);
 static char *errorLoadText(const char *page_name);
@@ -186,9 +186,15 @@ errorInitialize(void)
         }
     }
 
+    error_stylesheet.reset();
+
     // look for and load stylesheet into global MemBuf for it.
     if(Config.errorStylesheet) {
-        error_page_stylesheet_content = errorLoadText(Config.errorStylesheet);
+        char *temp = errorLoadText(Config.errorStylesheet);
+        if(temp) {
+            error_stylesheet.Printf("%s",temp);
+            safe_free(temp);
+        }
     }
 }
 
@@ -683,7 +689,7 @@ ErrorState::Convert(char token)
         break;
 
     case 'l':
-        mb.append(error_page_stylesheet_content.content(), error_page_stylesheet_content.contentSize());
+        mb.append(error_stylesheet.content(), error_stylesheet.contentSize());
         do_quote = 0;
         break;