Merging changes on MOZILLA_1_7_BRANCH between AVIARY_1_0_20040515_BASE and MOZILLA_1_7_RELEASE: bug 245813.

git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158215 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/wallet/src/nsPasswordManager.cpp

@@ -225,8 +225,10 @@ nsPasswordManager::FindPasswordEntry
   // Emumerate through set of saved logins
   while (hasMoreElements) {
     rv = enumerator->GetNext(getter_AddRefs(passwordElem));
+    if (NS_FAILED(rv))
+      return rv;
 
-    if (NS_SUCCEEDED(rv) && passwordElem) {
+    if (passwordElem) {
 
       // Get the contents of this saved login
       nsCAutoString hostURI;