From 06bc32adeddd32c8a822db86fcafedf6420aab7f Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 27 Aug 2005 15:35:21 +0000
Subject: [PATCH] bug 295070 return rv, not nsnull, in an nsresult method patch
 by Joshua Welderson <pythonesque+bugzilla@gmail.com> r=smontagu sr=bz

git-svn-id: svn://10.0.0.236/trunk@179131 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/intl/uconv/src/nsConverterInputStream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mozilla/intl/uconv/src/nsConverterInputStream.cpp b/mozilla/intl/uconv/src/nsConverterInputStream.cpp
index 362c087bbac..a81a6171e04 100644
--- a/mozilla/intl/uconv/src/nsConverterInputStream.cpp
+++ b/mozilla/intl/uconv/src/nsConverterInputStream.cpp
@@ -63,7 +63,7 @@ nsConverterInputStream::Init(nsIInputStream* aStream,
     // get the decoder
     nsCOMPtr<nsICharsetConverterManager> ccm =
         do_GetService(kCharsetConverterManagerCID, &rv);
-    if (NS_FAILED(rv)) return nsnull;
+    if (NS_FAILED(rv)) return rv;
 
     rv = ccm->GetUnicodeDecoder(aCharset ? aCharset : "ISO-8859-1", getter_AddRefs(mConverter));
     if (NS_FAILED(rv)) return rv;