diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
index 5d223765837..7a6e02215db 100644
--- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -630,20 +630,22 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const
 
   fputs("HTML CSS Style Sheet: ", out);
 #ifdef NECKO
-  char* buffer;
-  mURL->GetSpec(&buffer);
+  char* urlSpec = nsnull;
+  mURL->GetSpec(&urlSpec);
+  if (urlSpec) {
+    fputs(urlSpec, out);
+    nsCRT::free(urlSpec);
+  }
 #else
-  PRUnichar* buffer;
-  mURL->ToString(&buffer);
+  PRUnichar* urlSpec = nsnull;
+  mURL->ToString(&urlSpec);
+  if (urlSpec) {
+    nsAutoString buffer(urlSpec);
+    fputs(buffer, out);
+    delete [] urlSpec;
+  }
 #endif
-  nsAutoString as(buffer,0);
-  fputs(as, out);
   fputs("\n", out);
-#ifdef NECKO
-  nsCRT::free(buffer);
-#else
-  delete buffer;
-#endif
 }
 
 
diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
index a450e919bf9..0bf52a8af2b 100644
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -1109,20 +1109,22 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const
 
   fputs("HTML Style Sheet: ", out);
 #ifdef NECKO
-  char* buffer;
-  mURL->GetSpec(&buffer);
+  char* urlSpec = nsnull;
+  mURL->GetSpec(&urlSpec);
+  if (urlSpec) {
+    fputs(urlSpec, out);
+    nsCRT::free(urlSpec);
+  }
 #else
-  PRUnichar* buffer;
-  mURL->ToString(&buffer);
+  PRUnichar* urlSpec = nsnull;
+  mURL->ToString(&urlSpec);
+  if (urlSpec) {
+    nsAutoString buffer(urlSpec);
+    fputs(buffer, out);
+    delete [] urlSpec;
+  }
 #endif
-  nsAutoString as(buffer,0);
-  fputs(as, out);
   fputs("\n", out);
-#ifdef NECKO
-  nsCRT::free(buffer);
-#else
-  delete buffer;
-#endif
 }
 
 
diff --git a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
index 5d223765837..7a6e02215db 100644
--- a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -630,20 +630,22 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const
 
   fputs("HTML CSS Style Sheet: ", out);
 #ifdef NECKO
-  char* buffer;
-  mURL->GetSpec(&buffer);
+  char* urlSpec = nsnull;
+  mURL->GetSpec(&urlSpec);
+  if (urlSpec) {
+    fputs(urlSpec, out);
+    nsCRT::free(urlSpec);
+  }
 #else
-  PRUnichar* buffer;
-  mURL->ToString(&buffer);
+  PRUnichar* urlSpec = nsnull;
+  mURL->ToString(&urlSpec);
+  if (urlSpec) {
+    nsAutoString buffer(urlSpec);
+    fputs(buffer, out);
+    delete [] urlSpec;
+  }
 #endif
-  nsAutoString as(buffer,0);
-  fputs(as, out);
   fputs("\n", out);
-#ifdef NECKO
-  nsCRT::free(buffer);
-#else
-  delete buffer;
-#endif
 }
 
 
diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
index a450e919bf9..0bf52a8af2b 100644
--- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
@@ -1109,20 +1109,22 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const
 
   fputs("HTML Style Sheet: ", out);
 #ifdef NECKO
-  char* buffer;
-  mURL->GetSpec(&buffer);
+  char* urlSpec = nsnull;
+  mURL->GetSpec(&urlSpec);
+  if (urlSpec) {
+    fputs(urlSpec, out);
+    nsCRT::free(urlSpec);
+  }
 #else
-  PRUnichar* buffer;
-  mURL->ToString(&buffer);
+  PRUnichar* urlSpec = nsnull;
+  mURL->ToString(&urlSpec);
+  if (urlSpec) {
+    nsAutoString buffer(urlSpec);
+    fputs(buffer, out);
+    delete [] urlSpec;
+  }
 #endif
-  nsAutoString as(buffer,0);
-  fputs(as, out);
   fputs("\n", out);
-#ifdef NECKO
-  nsCRT::free(buffer);
-#else
-  delete buffer;
-#endif
 }
 
 
diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
index 5d223765837..7a6e02215db 100644
--- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -630,20 +630,22 @@ void HTMLCSSStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const
 
   fputs("HTML CSS Style Sheet: ", out);
 #ifdef NECKO
-  char* buffer;
-  mURL->GetSpec(&buffer);
+  char* urlSpec = nsnull;
+  mURL->GetSpec(&urlSpec);
+  if (urlSpec) {
+    fputs(urlSpec, out);
+    nsCRT::free(urlSpec);
+  }
 #else
-  PRUnichar* buffer;
-  mURL->ToString(&buffer);
+  PRUnichar* urlSpec = nsnull;
+  mURL->ToString(&urlSpec);
+  if (urlSpec) {
+    nsAutoString buffer(urlSpec);
+    fputs(buffer, out);
+    delete [] urlSpec;
+  }
 #endif
-  nsAutoString as(buffer,0);
-  fputs(as, out);
   fputs("\n", out);
-#ifdef NECKO
-  nsCRT::free(buffer);
-#else
-  delete buffer;
-#endif
 }
 
 
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index a450e919bf9..0bf52a8af2b 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -1109,20 +1109,22 @@ void HTMLStyleSheetImpl::List(FILE* out, PRInt32 aIndent) const
 
   fputs("HTML Style Sheet: ", out);
 #ifdef NECKO
-  char* buffer;
-  mURL->GetSpec(&buffer);
+  char* urlSpec = nsnull;
+  mURL->GetSpec(&urlSpec);
+  if (urlSpec) {
+    fputs(urlSpec, out);
+    nsCRT::free(urlSpec);
+  }
 #else
-  PRUnichar* buffer;
-  mURL->ToString(&buffer);
+  PRUnichar* urlSpec = nsnull;
+  mURL->ToString(&urlSpec);
+  if (urlSpec) {
+    nsAutoString buffer(urlSpec);
+    fputs(buffer, out);
+    delete [] urlSpec;
+  }
 #endif
-  nsAutoString as(buffer,0);
-  fputs(as, out);
   fputs("\n", out);
-#ifdef NECKO
-  nsCRT::free(buffer);
-#else
-  delete buffer;
-#endif
 }