SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31514 from CodethinkLabs/ptyfwd_issues

Browse Source 
ptyfwd/terminal-util: improve edge case handling
This commit is contained in:
Lennart Poettering
2024-02-28 18:36:50 +01:00
committed by GitHub
parent 78816ce72e d848a94998
commit 6aa14b283b
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/ptyfwd.c
+14 -4
View File
@@ -270,7 +270,9 @@ static int insert_newline_color_erase(PTYForward *f, size_t offset) {
_cleanup_free_ char *s = NULL;
assert(f);
assert(f->background_color);
if (!f->background_color)
return 0;
/* When we see a newline (ASCII 10) then this sets the background color to the desired one, and erase the rest
* of the line with it */
@@ -289,7 +291,9 @@ static int insert_carriage_return_color(PTYForward *f, size_t offset) {
_cleanup_free_ char *s = NULL;
assert(f);
assert(f->background_color);
if (!f->background_color)
return 0;
/* When we see a carriage return (ASCII 13) this this sets only the background */
@@ -503,9 +507,15 @@ static int pty_forward_ansi_process(PTYForward *f, size_t offset) {
} else if (!strextend(&f->osc_sequence, CHAR_TO_STR(c)))
return -ENOMEM;
} else {
/* Otherwise, the OSC sequence is over */
/* Otherwise, the OSC sequence is over
*
* There are two allowed ways to end an OSC sequence:
* BEL '\x07'
* String Terminator (ST): <Esc>\ - "\x1b\x5c"
* since we cannot lookahead to see if the Esc is followed by a \
* we cut a corner here and assume it will be \. */
if (c == '\x07') {
if (c == '\x07' || c == '\x1b') {
r = insert_window_title_fix(f, i+1);
if (r < 0)
return r;