Bug 1472672: Add null check for textAcc. draft
authorRobert Bartlensky <rbartlensky@mozilla.com>
Wed, 04 Jul 2018 14:09:32 +0100
changeset 814092 15f7c37d46c994205a5d7858e0f1f54d5a636ee7
parent 814073 a9dc5dc8e2b8513686ad1b1f28c9e4da6de62226
push id115090
push userbmo:rbartlensky@mozilla.com
push dateWed, 04 Jul 2018 13:17:31 +0000
bugs1472672
milestone63.0a1
Bug 1472672: Add null check for textAcc. MozReview-Commit-ID: AL7R1fdlcvN
accessible/atk/nsMaiInterfaceText.cpp
--- a/accessible/atk/nsMaiInterfaceText.cpp
+++ b/accessible/atk/nsMaiInterfaceText.cpp
@@ -458,18 +458,18 @@ getRangeExtentsCB(AtkText *aText, gint a
 }
 
 static gint
 getCharacterCountCB(AtkText *aText)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aText));
   if (accWrap) {
     HyperTextAccessible* textAcc = accWrap->AsHyperText();
-    return
-      textAcc->IsDefunct() ? 0 : static_cast<gint>(textAcc->CharacterCount());
+    return !textAcc || textAcc->IsDefunct() ?
+        0 : static_cast<gint>(textAcc->CharacterCount());
   }
 
   if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) {
     return proxy->CharacterCount();
   }
 
   return 0;
 }