fix potential crash when get attribute from NSAttributedString with i…

…nvalid index.
castbox · Sep 13, 2016 · e1cfc1d · e1cfc1d
1 parent 01da280
commit e1cfc1d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/YYText/Utility/NSAttributedString+YYText.m b/YYText/Utility/NSAttributedString+YYText.m
@@ -78,13 +78,14 @@ + (instancetype)yy_unarchiveFromData:(NSData *)data {
 }
 
 - (NSDictionary *)yy_attributesAtIndex:(NSUInteger)index {
+    if (index > self.length || self.length == 0) return nil;
     if (self.length > 0 && index == self.length) index--;
     return [self attributesAtIndex:index effectiveRange:NULL];
 }
 
 - (id)yy_attribute:(NSString *)attributeName atIndex:(NSUInteger)index {
     if (!attributeName) return nil;
-    if (self.length == 0) return nil;
+    if (index > self.length || self.length == 0) return nil;
     if (self.length > 0 && index == self.length) index--;
     return [self attribute:attributeName atIndex:index effectiveRange:NULL];
 }