From cf86dfee4fcddc448ad0d234b23698408cdc5f45 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org"
 <dbaron%dbaron.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 20 Jun 2004 20:54:42 +0000
Subject: [PATCH] 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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mozilla/extensions/wallet/src/nsPasswordManager.cpp b/mozilla/extensions/wallet/src/nsPasswordManager.cpp
index 933e09db0df..a3b4826fb01 100644
--- a/mozilla/extensions/wallet/src/nsPasswordManager.cpp
+++ b/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;