Bug 1654601 - Ensure given text marker is valid in public API. r=MarcoZ

Differential Revision: https://phabricator.services.mozilla.com/D84567
Brli · Jul 22, 2020 · 41858f5 · 41858f5
1 parent 5779810
commit 41858f5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/accessible/mac/GeckoTextMarker.h b/accessible/mac/GeckoTextMarker.h
@@ -49,6 +49,8 @@ class GeckoTextMarker final {
   // Return a word range for the given offset.
   GeckoTextMarkerRange WordRange();
 
+  bool IsValid() const { return !mContainer.IsNull(); };
+
   bool operator<(const GeckoTextMarker& aPoint) const;
 
   AccessibleOrProxy mContainer;

diff --git a/accessible/mac/GeckoTextMarker.mm b/accessible/mac/GeckoTextMarker.mm
@@ -119,6 +119,7 @@ AXTextMarkerRangeRef AXTextMarkerRangeCreate(CFAllocatorRef allocator, AXTextMar
 }
 
 void GeckoTextMarker::NormalizeNext() {
+  MOZ_ASSERT(!mContainer.IsNull());
   if (AtEnd()) {
     // If this is the end of the current container, mutate to its parent's
     // end offset.
@@ -159,6 +160,7 @@ AXTextMarkerRangeRef AXTextMarkerRangeCreate(CFAllocatorRef allocator, AXTextMar
 }
 
 void GeckoTextMarker::NormalizePrevious() {
+  MOZ_ASSERT(!mContainer.IsNull());
   if (mOffset == 0) {
     // If we are at the beginning of a container, mutate to its parent's start offset.
     bool unused;
@@ -210,6 +212,7 @@ AXTextMarkerRangeRef AXTextMarkerRangeCreate(CFAllocatorRef allocator, AXTextMar
 }
 
 GeckoTextMarkerRange GeckoTextMarker::WordRange() {
+  MOZ_ASSERT(!mContainer.IsNull());
   int32_t wordstart_start = 0, wordstart_end = 0, wordend_start = 0, wordend_end = 0;
   nsAutoString unused;
   if (mContainer.IsProxy()) {

diff --git a/accessible/mac/MOXTextMarkerDelegate.mm b/accessible/mac/MOXTextMarkerDelegate.mm
@@ -143,6 +143,10 @@ - (id)moxEndTextMarkerForTextMarkerRange:(id)textMarkerRange {
 
 - (id)moxLeftWordTextMarkerRangeForTextMarker:(id)textMarker {
   GeckoTextMarker geckoTextMarker(mGeckoDocAccessible, textMarker);
+  if (!geckoTextMarker.IsValid()) {
+    return nil;
+  }
+
   geckoTextMarker.NormalizePrevious();
 
   if (geckoTextMarker.mOffset == 0) {
@@ -160,6 +164,10 @@ - (id)moxLeftWordTextMarkerRangeForTextMarker:(id)textMarker {
 
 - (id)moxRightWordTextMarkerRangeForTextMarker:(id)textMarker {
   GeckoTextMarker geckoTextMarker(mGeckoDocAccessible, textMarker);
+  if (!geckoTextMarker.IsValid()) {
+    return nil;
+  }
+
   geckoTextMarker.NormalizeNext();
 
   GeckoTextMarkerRange range = geckoTextMarker.AtEnd()
@@ -171,6 +179,9 @@ - (id)moxRightWordTextMarkerRangeForTextMarker:(id)textMarker {
 
 - (id)moxNextTextMarkerForTextMarker:(id)textMarker {
   GeckoTextMarker geckoTextMarker(mGeckoDocAccessible, textMarker);
+  if (!geckoTextMarker.IsValid()) {
+    return nil;
+  }
 
   geckoTextMarker.NormalizeNext();
   if (geckoTextMarker.AtEnd()) {
@@ -184,6 +195,9 @@ - (id)moxNextTextMarkerForTextMarker:(id)textMarker {
 
 - (id)moxPreviousTextMarkerForTextMarker:(id)textMarker {
   GeckoTextMarker geckoTextMarker(mGeckoDocAccessible, textMarker);
+  if (!geckoTextMarker.IsValid()) {
+    return nil;
+  }
 
   geckoTextMarker.NormalizePrevious();
   if (geckoTextMarker.mOffset == 0) {