Merge pull request #35 from CodingFriends/fix/28-crash-untab-eof

Fix crash when untabbing at end of file #28
CodingFriends · Feb 23, 2020 · fb55861 · fb55861
2 parents 82a4de0 + 8cf1c23
commit fb55861
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Source/Tincta/TextEditor/TCTextView.m b/Source/Tincta/TextEditor/TCTextView.m
@@ -268,6 +268,8 @@ - (void)insertBacktab:(id)sender {
     NSInteger selLength = selRange.length;
     NSInteger selMax = NSMaxRange(selRange);
     NSString* text = [self string];
+
+
     NSRange lineRange = [text lineRangeForRange:NSMakeRange(selLoc, 0)];
     NSInteger lineStart = lineRange.location;
     while (lineStart <= selMax) { //iterate over all selected lines
@@ -317,13 +319,13 @@ - (void)insertBacktab:(id)sender {
             if (selLoc > self.string.length || selLoc < 0) {
                 selLoc = 0;
             }
-        } else if ((lineStart >= selLoc)&& [text characterAtIndex:lineStart] == '\t') {
+        } else if ((lineStart >= selLoc) && (text.length > lineStart) && [text characterAtIndex:lineStart] == '\t') {
             //remove tab at line start
             stringToReplace = @"\t";
             blankLength = 1;
             tabReplaceRange = NSMakeRange(lineStart, blankLength);
             selLength -= blankLength;
-        } else if ((lineStart >= selLoc)&& [text characterAtIndex:lineStart] == ' ') {
+        } else if ((lineStart >= selLoc) && (text.length > lineStart) &&[text characterAtIndex:lineStart] == ' ') {
             //remove blanks at line start
             blankLength = 0;
             NSInteger tabLength = tabBlankLength;