From fa22cc6eb07fdcdc4e5c464ccbb3f9a98624b73a Mon Sep 17 00:00:00 2001
From: "aaronleventhal%moonset.net" <aaronleventhal%moonset.net>
Date: Fri, 15 Feb 2008 14:54:58 +0000
Subject: [PATCH] bug 417500. Crash [ @ CAccessibleText::get_attributes ].
 r=surkov, a=beltzner

---
 accessible/src/msaa/CAccessibleText.cpp  | 6 +++---
 accessible/src/msaa/nsAccessibleWrap.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/accessible/src/msaa/CAccessibleText.cpp b/accessible/src/msaa/CAccessibleText.cpp
index 37720b62722..9fb12f0a091 100755
--- a/accessible/src/msaa/CAccessibleText.cpp
+++ b/accessible/src/msaa/CAccessibleText.cpp
@@ -113,12 +113,12 @@ __try {
   if (!winAccessNode)
     return E_FAIL;
 
-  void **instancePtr = 0;
-  winAccessNode->QueryNativeInterface(IID_IAccessible2, instancePtr);
+  void *instancePtr = 0;
+  winAccessNode->QueryNativeInterface(IID_IAccessible2, &instancePtr);
   if (!instancePtr)
     return E_FAIL;
 
-  IAccessible2 *pAccessible2 = static_cast<IAccessible2*>(*instancePtr);
+  IAccessible2 *pAccessible2 = static_cast<IAccessible2*>(instancePtr);
   HRESULT hr = pAccessible2->get_attributes(aTextAttributes);
   pAccessible2->Release();
 
diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp
index 4e8a4bf43e1..9835e335e09 100644
--- a/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -1474,7 +1474,7 @@ __try {
     return E_FAIL;
 
   if (!attributes)
-    return S_OK;
+    return S_FALSE;
 
   nsCOMPtr<nsISimpleEnumerator> propEnum;
   attributes->Enumerate(getter_AddRefs(propEnum));