Merge branch 'master' of https://github.com/gnachman/iTerm2

sources/PTYSession.m

@@ -6098,6 +6098,13 @@ static NSTimeInterval kMinimumPartialLineTriggerCheckInterval = 0.5;
     if (range.start.x == -1) {
         return nil;
     }
+    // If semantic history goes nuts and the end-of-command code isn't received (which seems to be a
+    // common problem, probably because of buggy old versions of SH scripts) , the command can grow
+    // without bound. We'll limit the length of a command to avoid performance problems.
+    const int kMaxLines = 50;
+    if (range.end.y - range.start.y > kMaxLines) {
+        range.end.y = range.start.y + kMaxLines;
+    }
     iTermTextExtractor *extractor = [iTermTextExtractor textExtractorWithDataSource:_screen];
     NSString *command = [extractor contentInRange:VT100GridWindowedRangeMake(range, 0, 0)
                                        nullPolicy:kiTermTextExtractorNullPolicyFromStartToFirst

sources/VT100Screen.m

@@ -3483,7 +3483,7 @@ static NSString *const kInlineFileBase64String = @"base64 string";  // NSMutable
         return VT100GridCoordRangeMake(-1, -1, -1, -1);
     } else {
         return VT100GridCoordRangeMake(commandStartX_,
-                                       commandStartY_ - offset,
+                                       MAX(0, commandStartY_ - offset),
                                        currentGrid_.cursorX,
                                        currentGrid_.cursorY + [self numberOfScrollbackLines]);
     }

sources/iTermTextExtractor.m

@@ -815,6 +815,9 @@ static const int kNumCharsToSearchForDivider = 8;
 // A tab filler orphan is a tab filler that is followed by a tab filler orphan or a
 // non-tab character.
 - (NSIndexSet *)tabFillerOrphansOnRow:(int)row {
+    if (row < 0) {
+        return nil;
+    }
     NSMutableIndexSet *orphans = [NSMutableIndexSet indexSet];
     screen_char_t *line = [_dataSource getLineAtIndex:row];
     if (!line) {