From 2e936b1a00dd873488ee07cf2c7c3cdc5c55ff06 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com"
 <waterson%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 3 Mar 2000 23:15:34 +0000
Subject: [PATCH] Bug 29148. Initialize out-params to sane values before
 returning an error. There are lots of places that don't check return codes on
 these methods. r=rjc, a=jar.

git-svn-id: svn://10.0.0.236/trunk@62170 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/xul/content/src/nsXULElement.cpp | 12 +++++++++---
 mozilla/rdf/content/src/nsXULElement.cpp         | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index 19ec74be39a..4fa92a6eeac 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -2143,8 +2143,10 @@ NS_IMETHODIMP
 nsXULElement::ChildCount(PRInt32& aResult) const
 {
     nsresult rv;
-    if (NS_FAILED(rv = EnsureContentsGenerated()))
+    if (NS_FAILED(rv = EnsureContentsGenerated())) {
+        aResult = 0;
         return rv;
+    }
 
     return PeekChildCount(aResult);
 }
@@ -2153,8 +2155,10 @@ NS_IMETHODIMP
 nsXULElement::ChildAt(PRInt32 aIndex, nsIContent*& aResult) const
 {
     nsresult rv;
-    if (NS_FAILED(rv = EnsureContentsGenerated()))
+    if (NS_FAILED(rv = EnsureContentsGenerated())) {
+        aResult = nsnull;
         return rv;
+    }
 
     aResult = nsnull;
     if (! mChildren)
@@ -2176,8 +2180,10 @@ NS_IMETHODIMP
 nsXULElement::IndexOf(nsIContent* aPossibleChild, PRInt32& aResult) const
 {
     nsresult rv;
-    if (NS_FAILED(rv = EnsureContentsGenerated()))
+    if (NS_FAILED(rv = EnsureContentsGenerated())) {
+        aResult = -1;
         return rv;
+    }
 
     aResult = (mChildren) ? (mChildren->IndexOf(aPossibleChild)) : (-1);
     return NS_OK;
diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp
index 19ec74be39a..4fa92a6eeac 100644
--- a/mozilla/rdf/content/src/nsXULElement.cpp
+++ b/mozilla/rdf/content/src/nsXULElement.cpp
@@ -2143,8 +2143,10 @@ NS_IMETHODIMP
 nsXULElement::ChildCount(PRInt32& aResult) const
 {
     nsresult rv;
-    if (NS_FAILED(rv = EnsureContentsGenerated()))
+    if (NS_FAILED(rv = EnsureContentsGenerated())) {
+        aResult = 0;
         return rv;
+    }
 
     return PeekChildCount(aResult);
 }
@@ -2153,8 +2155,10 @@ NS_IMETHODIMP
 nsXULElement::ChildAt(PRInt32 aIndex, nsIContent*& aResult) const
 {
     nsresult rv;
-    if (NS_FAILED(rv = EnsureContentsGenerated()))
+    if (NS_FAILED(rv = EnsureContentsGenerated())) {
+        aResult = nsnull;
         return rv;
+    }
 
     aResult = nsnull;
     if (! mChildren)
@@ -2176,8 +2180,10 @@ NS_IMETHODIMP
 nsXULElement::IndexOf(nsIContent* aPossibleChild, PRInt32& aResult) const
 {
     nsresult rv;
-    if (NS_FAILED(rv = EnsureContentsGenerated()))
+    if (NS_FAILED(rv = EnsureContentsGenerated())) {
+        aResult = -1;
         return rv;
+    }
 
     aResult = (mChildren) ? (mChildren->IndexOf(aPossibleChild)) : (-1);
     return NS_OK;