Merge pull request #211963 from microsoft/tyriar/211884

Fix escaping of characters in bash SI script
microsoft · May 3, 2024 · b68cc7d · b68cc7d
2 parents e54d7e9 + 97b3360
commit b68cc7d
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration-bash.sh
@@ -117,15 +117,13 @@ __vsc_escape_value() {
 	for (( i=0; i < "${#str}"; ++i )); do
 		byte="${str:$i:1}"
 
-		# Escape backslashes, semi-colons, escapes, and newlines
+		# Escape backslashes, semi-colons specially, then special ASCII chars below space (0x20)
 		if [ "$byte" = "\\" ]; then
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then
 			token="\\x3b"
-		elif [ "$byte" = $'\n' ]; then
-			token="\x0a"
-		elif [ "$byte" = $'\e' ]; then
-			token="\\x1b"
+		elif (( $(builtin printf '%d' "'$byte") < 31 )); then
+			token=$(builtin printf '\\x%02x' "'$byte")
 		else
 			token="$byte"
 		fi