Fixing nsbeta2+ bug 44001, nulling out output parameters to avoid crasing. r=vidur@netscape.com

content/html/content/src/nsGenericHTMLElement.cpp

@@ -360,6 +360,9 @@ nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsString& aDecl,
 nsresult 
 nsDOMCSSAttributeDeclaration::GetParent(nsISupports **aParent)
 {
+  NS_ENSURE_ARG_POINTER(aParent);
+  *aParent = nsnull;
+
   if (nsnull != mContent) {
     return mContent->QueryInterface(kISupportsIID, (void **)aParent);
   }

content/html/style/src/nsDOMCSSDeclaration.cpp

@@ -147,15 +147,15 @@ nsDOMCSSDeclaration::GetLength(PRUint32* aLength)
 NS_IMETHODIMP
 nsDOMCSSDeclaration::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
+  NS_ENSURE_ARG_POINTER(aParentRule);
+  *aParentRule = nsnull;
+
   nsCOMPtr<nsISupports> parent;
 
   GetParent(getter_AddRefs(parent));
 
   if (parent) {
     parent->QueryInterface(NS_GET_IID(nsIDOMCSSRule), (void **)aParentRule);
-  } else {
-    NS_ENSURE_ARG_POINTER(aParentRule);
-    *aParentRule = nsnull;
   }
 
   return NS_OK;

layout/html/content/src/nsGenericHTMLElement.cpp

@@ -360,6 +360,9 @@ nsDOMCSSAttributeDeclaration::ParseDeclaration(const nsString& aDecl,
 nsresult 
 nsDOMCSSAttributeDeclaration::GetParent(nsISupports **aParent)
 {
+  NS_ENSURE_ARG_POINTER(aParent);
+  *aParent = nsnull;
+
   if (nsnull != mContent) {
     return mContent->QueryInterface(kISupportsIID, (void **)aParent);
   }

layout/html/style/src/nsDOMCSSDeclaration.cpp

@@ -147,15 +147,15 @@ nsDOMCSSDeclaration::GetLength(PRUint32* aLength)
 NS_IMETHODIMP
 nsDOMCSSDeclaration::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
+  NS_ENSURE_ARG_POINTER(aParentRule);
+  *aParentRule = nsnull;
+
   nsCOMPtr<nsISupports> parent;
 
   GetParent(getter_AddRefs(parent));
 
   if (parent) {
     parent->QueryInterface(NS_GET_IID(nsIDOMCSSRule), (void **)aParentRule);
-  } else {
-    NS_ENSURE_ARG_POINTER(aParentRule);
-    *aParentRule = nsnull;
   }
 
   return NS_OK;

layout/style/nsDOMCSSDeclaration.cpp

@@ -147,15 +147,15 @@ nsDOMCSSDeclaration::GetLength(PRUint32* aLength)
 NS_IMETHODIMP
 nsDOMCSSDeclaration::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
+  NS_ENSURE_ARG_POINTER(aParentRule);
+  *aParentRule = nsnull;
+
   nsCOMPtr<nsISupports> parent;
 
   GetParent(getter_AddRefs(parent));
 
   if (parent) {
     parent->QueryInterface(NS_GET_IID(nsIDOMCSSRule), (void **)aParentRule);
-  } else {
-    NS_ENSURE_ARG_POINTER(aParentRule);
-    *aParentRule = nsnull;
   }
 
   return NS_OK;