Skip to content

Commit ffadc0b

Browse files
committed
Fix NPEs on buffer line and windowsPty option
1 parent 380e680 commit ffadc0b

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/common/InputHandler.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,10 +1152,12 @@ export class InputHandler extends Disposable implements IInputHandler {
11521152
* @param y row index
11531153
*/
11541154
private _resetBufferLine(y: number, respectProtect: boolean = false): void {
1155-
const line = this._activeBuffer.lines.get(this._activeBuffer.ybase + y)!;
1156-
line.fill(this._activeBuffer.getNullCell(this._eraseAttrData()), respectProtect);
1157-
this._bufferService.buffer.clearMarkers(this._activeBuffer.ybase + y);
1158-
line.isWrapped = false;
1155+
const line = this._activeBuffer.lines.get(this._activeBuffer.ybase + y);
1156+
if (line) {
1157+
line.fill(this._activeBuffer.getNullCell(this._eraseAttrData()), respectProtect);
1158+
this._bufferService.buffer.clearMarkers(this._activeBuffer.ybase + y);
1159+
line.isWrapped = false;
1160+
}
11591161
}
11601162

11611163
/**

src/common/services/OptionsService.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,16 @@ export class OptionsService extends Disposable implements IOptionsService {
178178
if (value <= 0) {
179179
throw new Error(`${key} cannot be less than or equal to 0, value: ${value}`);
180180
}
181+
break;
181182
case 'rows':
182183
case 'cols':
183184
if (!value && value !== 0) {
184185
throw new Error(`${key} must be numeric, value: ${value}`);
185186
}
186187
break;
188+
case 'windowsPty':
189+
value = value ?? {};
190+
break;
187191
}
188192
return value;
189193
}

0 commit comments

Comments
 (0)