Safely handle end-of-line

TextureGroup · Mar 7, 2019 · ceb9b67 · ceb9b67
1 parent e725cb6
commit ceb9b67
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -607,7 +607,7 @@ - (id)_linkAttributeValueAtPoint:(CGPoint)point
   static constexpr CGSize kRectOffsets[9] = {
     { 0, 0 },
     { -22, 0 }, { 22, 0 },
-    { 0, -22 } , { 0, 22 },
+    { 0, -22 }, { 0, 22 },
     { -22, -22 }, { -22, 22 },
     { 22, -22 }, { 22, 22 }
   };
@@ -616,6 +616,9 @@ - (id)_linkAttributeValueAtPoint:(CGPoint)point
     const CGPoint testPoint = CGPointMake(point.x + offset.width,
                                           point.y + offset.height);
     ASTextPosition *pos = [layout closestPositionToPoint:testPoint];
+    if (!pos || !NSLocationInRange(pos.offset, clampedRange)) {
+      continue;
+    }
     for (NSString *attributeName in _linkAttributeNames) {
       NSRange effectiveRange = NSMakeRange(0, 0);
       id value = [_attributedText attribute:attributeName atIndex:pos.offset
@@ -642,7 +645,6 @@ - (id)_linkAttributeValueAtPoint:(CGPoint)point
       return value;
     }
   }
-
 
   return nil;
 }