Skip to content

GUACAMOLE-2213: New function, guac_terminal_unknown_osc, to ignore unrecognised OSC sequences#654

Merged
mike-jumper merged 2 commits intoapache:staging/1.6.1from
andywarduk:GUACAMOLE-2213
Apr 6, 2026
Merged

GUACAMOLE-2213: New function, guac_terminal_unknown_osc, to ignore unrecognised OSC sequences#654
mike-jumper merged 2 commits intoapache:staging/1.6.1from
andywarduk:GUACAMOLE-2213

Conversation

@andywarduk
Copy link
Copy Markdown
Contributor

guac_terminal_osc in src/terminal/terminal-handlers.c does not correctly ignore unrecognised OSC sequences. It will revert to guac_terminal_echo on the first unrecognised character received.

The patch sets the character handler to a new function, guac_terminal_unknown_osc which ignores all characters until ECMA-48 ST (String Terminator).

Comment thread src/terminal/terminal-handlers.c Outdated
Comment thread src/terminal/terminal-handlers.c
@mike-jumper
Copy link
Copy Markdown
Contributor

mike-jumper commented Apr 2, 2026

I think it's probably worth pulling this into 1.6.1, if you want to rebase against staging/1.6.1.

Didn't notice on my initial read, but:

Please also either rebase to combine commit 5cbf029 into the initial commit or fix the message to include the JIRA issue, cover the high-level nature of the change, etc. (same style and standard as any other commit).

@andywarduk andywarduk force-pushed the GUACAMOLE-2213 branch 2 times, most recently from 05e9b72 to 274630e Compare April 3, 2026 07:05
@andywarduk andywarduk changed the base branch from main to staging/1.6.1 April 3, 2026 07:13
@andywarduk
Copy link
Copy Markdown
Contributor Author

I've rebased to staging/1.6.1 (after a couple of failed attempts, sorry) and squashed the commits in to one with a compliant commit message.

@andywarduk andywarduk requested a review from mike-jumper April 3, 2026 07:17
@andywarduk
Copy link
Copy Markdown
Contributor Author

Btw, pull request 613 seems to be an alternative fix for this.

Comment thread src/terminal/terminal-handlers.c Outdated
@mike-jumper mike-jumper merged commit 235a2d4 into apache:staging/1.6.1 Apr 6, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants