Bug 334205: nsPrimitiveHelpers::ConvertPlatformPlainTextToUnicode returns unitialized value if outUnicodeLen = 0, r=timeless, sr=jag

widget/src/xpwidgets/nsPrimitiveHelpers.cpp

@@ -156,19 +156,15 @@ nsPrimitiveHelpers :: ConvertUnicodeToPlatformPlainText ( PRUnichar* inUnicode,
   if ( !outPlainTextData || !outPlainTextLen )
     return NS_ERROR_INVALID_ARG;
 
-  // Get the appropriate unicode encoder. We're guaranteed that this won't change
-  // through the life of the app so we can cache it.
-  nsresult rv;
-  nsCOMPtr<nsIUnicodeEncoder> encoder;
-
   // get the charset
-  nsCAutoString platformCharset;
+  nsresult rv;
   nsCOMPtr <nsIPlatformCharset> platformCharsetService = do_GetService(NS_PLATFORMCHARSET_CONTRACTID, &rv);
+
+  nsCAutoString platformCharset;
   if (NS_SUCCEEDED(rv))
     rv = platformCharsetService->GetCharset(kPlatformCharsetSel_PlainTextInClipboard, platformCharset);
   if (NS_FAILED(rv))
     platformCharset.AssignLiteral("ISO-8859-1");
-  
 
   // use transliterate to convert things like smart quotes to normal quotes for plain text
 
@@ -207,7 +203,7 @@ nsPrimitiveHelpers :: ConvertPlatformPlainTextToUnicode ( const char* inText, PR
 
   // Get the appropriate unicode decoder. We're guaranteed that this won't change
   // through the life of the app so we can cache it.
-  nsresult rv;
+  nsresult rv = NS_OK;
   static nsCOMPtr<nsIUnicodeDecoder> decoder;
   static PRBool hasConverter = PR_FALSE;
   if ( !hasConverter ) {