Merge pull request #1735 from Tyriar/60291_infinite_loop

Fix infinite loop
This commit is contained in:
Daniel Imms
2018-10-09 09:37:21 -07:00
committed by GitHub
2 changed files with 11 additions and 2 deletions
+7
View File
@@ -469,4 +469,11 @@ describe('InputHandler', () => {
} }
expect(s).equals('World '); expect(s).equals('World ');
}); });
describe('print', () => {
it('should not cause an infinite loop (regression test)', () => {
const term = new Terminal();
const inputHandler = new InputHandler(term);
inputHandler.print(String.fromCharCode(0x200B), 0, 1);
});
});
}); });
+4 -2
View File
@@ -452,8 +452,10 @@ export class InputHandler extends Disposable implements IInputHandler {
// fullwidth char - also set next cell to placeholder stub and advance cursor // fullwidth char - also set next cell to placeholder stub and advance cursor
// for graphemes bigger than fullwidth we can simply loop to zero // for graphemes bigger than fullwidth we can simply loop to zero
// we already made sure above, that buffer.x + chWidth will not overflow right // we already made sure above, that buffer.x + chWidth will not overflow right
while (--chWidth) { if (chWidth > 0) {
bufferRow.set(buffer.x++, [curAttr, '', 0, undefined]); while (--chWidth) {
bufferRow.set(buffer.x++, [curAttr, '', 0, undefined]);
}
} }
} }
this._terminal.updateRange(buffer.y); this._terminal.updateRange(buffer.y);