Skip to content
TypeScript

fix(shared): ignore unsupported command output control parameters (#29736)

Romil7f92cb0e49c5
diff --git a/packages/shared/src/terminalOutput.test.ts b/packages/shared/src/terminalOutput.test.ts
index aaaf8c63352..233ee6cbb53 100644
--- a/packages/shared/src/terminalOutput.test.ts
+++ b/packages/shared/src/terminalOutput.test.ts
@@ -43,6 +43,9 @@ describe("appendTerminalOutput", () => {
const first = appendTerminalOutput(EMPTY_TERMINAL_OUTPUT, "red: \u001b[3");
expect(first.text).toBe("red: ");
expect(feed(["red: \u001b[3", "1mR\u001b[0m"]).text).toBe("red: \u001b[0;31mR\u001b[0m");
+ expect(
+ terminalOutputSpans(feed(["\u001b[38:2::12:", "34:56mR"]).text, TERMINAL_PALETTES.dark),
+ ).toEqual([{ text: "R", style: { color: "rgb(12,34,56)" } }]);
});
it("keeps a bounded tail that starts on a fresh line", () => {
@@ -105,6 +108,16 @@ describe("appendTerminalOutput edge cases from review", () => {
});
describe("appendTerminalOutput under adversarial output", () => {
+ it("ignores unsupported cursor-control parameters without corrupting the screen", () => {
+ for (const sequence of ["1.5A", "1.5G", "1$K", "1$J", ">1A", "?25l", "1:2A", "1:2K", "1:2J"]) {
+ const input = `a\nb\nc\u001b[${sequence}X`;
+ expect(feed([input]).text).toBe("a\nb\ncX");
+ for (let cut = 1; cut < input.length; cut += 1) {
+ expect(feed([input.slice(0, cut), input.slice(cut)]).text).toBe("a\nb\ncX");
+ }
+ }
+ });
+
it("gives the same result however the output is split into chunks", () => {
const input =
"abcdef\rX\u001b[31mred\u001b[0m\nnext line\r\u001b[2Kdone\n" +
diff --git a/packages/shared/src/terminalOutput.ts b/packages/shared/src/terminalOutput.ts
index b930282f777..6bf4e318ef6 100644
--- a/packages/shared/src/terminalOutput.ts
+++ b/packages/shared/src/terminalOutput.ts
@@ -393,7 +393,7 @@ class Terminal {
}
csi(params: string, final: string): void {
- if (/^[?>=]/u.test(params)) return; // Mode switches (cursor visibility, bracketed paste).
+ if (!/^[\d;:]*$/u.test(params) || (final !== "m" && params.includes(":"))) return;
if (final === "m") {
const key = `${this.pen}|${params}`;
let pen = penTransitions.get(key);