From 6b1eef9999b5847ecc4635bed35b5b04dd8d7155 Mon Sep 17 00:00:00 2001 From: "ginn.chen%sun.com" Date: Wed, 21 Dec 2005 09:09:55 +0000 Subject: [PATCH] Bug 320914 Firefox crashed with gnopernicus magnifier [@nsXULMenuitemAccessible::GetState] r=aaronleventhal sr=roc git-svn-id: svn://10.0.0.236/trunk@186359 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp | 1 - mozilla/accessible/src/xul/nsXULMenuAccessible.cpp | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp b/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp index 670aeecc1f3..09b453d1aed 100644 --- a/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp +++ b/mozilla/accessible/src/xul/nsXULFormControlAccessible.cpp @@ -138,7 +138,6 @@ NS_IMETHODIMP nsXULButtonAccessible::GetState(PRUint32 *aState) } nsCOMPtr element(do_QueryInterface(mDOMNode)); - NS_ASSERTION(element, "No nsIDOMElement for button node!"); if (element) { PRBool isDefault = PR_FALSE; element->HasAttribute(NS_LITERAL_STRING("default"), &isDefault) ; diff --git a/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp b/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp index b7776e4eb2a..93f3610bb4b 100644 --- a/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp +++ b/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp @@ -62,7 +62,8 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetState(PRUint32 *_retval) // Focused? nsCOMPtr element(do_QueryInterface(mDOMNode)); - NS_ASSERTION(element, "No DOM element for menu node!"); + if (!element) + return NS_ERROR_FAILURE; PRBool isFocused = PR_FALSE; element->HasAttribute(NS_LITERAL_STRING("_moz-menuactive"), &isFocused); if (isFocused) @@ -111,7 +112,9 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetState(PRUint32 *_retval) NS_IMETHODIMP nsXULMenuitemAccessible::GetName(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); - NS_ASSERTION(element, "No DOM element for menu node!"); + if (!element) { + return NS_ERROR_FAILURE; + } element->GetAttribute(NS_LITERAL_STRING("label"), _retval); return NS_OK;