From 846a54d15e9288cf857b4edafea1fe19be0d6f1f Mon Sep 17 00:00:00 2001
From: "darin%netscape.com" <darin%netscape.com>
Date: Thu, 3 Apr 2003 19:36:27 +0000
Subject: [PATCH] fixes bug 200365 "trunk topcrash [@
 nsUnknownDecoder::SniffForImageMimeType]" r=dougt sr=bz

---
 netwerk/streamconv/converters/nsUnknownDecoder.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/netwerk/streamconv/converters/nsUnknownDecoder.cpp b/netwerk/streamconv/converters/nsUnknownDecoder.cpp
index dde1da2599ea..73358629764f 100644
--- a/netwerk/streamconv/converters/nsUnknownDecoder.cpp
+++ b/netwerk/streamconv/converters/nsUnknownDecoder.cpp
@@ -409,13 +409,14 @@ PRBool nsUnknownDecoder::SniffForImageMimeType(nsIRequest* aRequest)
 {
   // Just ask libpr0n
   nsCOMPtr<imgILoader> loader(do_GetService("@mozilla.org/image/loader;1"));
-  char* temp;
-  loader->SupportImageWithContents(mBuffer, mBufferLen, &temp);
-  if (temp) {
-    mContentType.Adopt(temp);
-  }
+  if (!loader) return PR_FALSE;
 
-  return temp != nsnull;
+  char* temp;
+  nsresult rv = loader->SupportImageWithContents(mBuffer, mBufferLen, &temp);
+  if (NS_FAILED(rv) || !temp) return PR_FALSE;
+
+  mContentType.Adopt(temp);
+  return PR_TRUE;
 }
 
 PRBool nsUnknownDecoder::SniffForXML(nsIRequest* aRequest)