From: noname <noname@inventati.org>
Date: Fri, 25 Apr 2014 22:12:41 +0000 (+0200)
Subject: Do not eat ESC character if control string is not properly terminated.
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=02d2df5790d186f16e0e22becd8107a85f328c2f

Do not eat ESC character if control string is not properly terminated.

Currently tputc handles the case of too long control string waiting for
the end of control string.

Another case is when there is ESC character is encountered but is not
followed by '\\'.  In this case st stops processing control string,
but ESC character is ignored.

After this patch st processes ESC characters in control strings properly.

Test case:
printf '\e]0;abc\e[1mBOLD\e[0m'

Also ^[\ is actually processed in the code that handles ST.
According to ECMA-048 ST stands for STRING TERMINATOR and is used to
close control strings.
---

diff --git a/st.c b/st.c
index cacbe20..d2261e2 100644
--- a/st.c
+++ b/st.c
@@ -2452,10 +2452,6 @@ tputc(char *c, int len) {
 				csiparse();
 				csihandle();
 			}
-		} else if(term.esc & ESC_STR_END) {
-			term.esc = 0;
-			if(ascii == '\\')
-				strhandle();
 		} else if(term.esc & ESC_ALTCHARSET) {
 			tdeftran(ascii);
 			tselcs();
@@ -2545,7 +2541,9 @@ tputc(char *c, int len) {
 				tcursor(CURSOR_LOAD);
 				term.esc = 0;
 				break;
-			case '\\': /* ST -- Stop */
+			case '\\': /* ST -- String Terminator */
+				if(term.esc & ESC_STR_END)
+					strhandle();
 				term.esc = 0;
 				break;
 			default: