From 03377a41a907cec5c95b37f9f8ba85168db959b2 Mon Sep 17 00:00:00 2001 From: Pierluigi Lenoci Date: Tue, 17 Mar 2026 00:36:47 +0100 Subject: [PATCH] fix(scripts): encode residual control chars as \uXXXX instead of stripping json_escape() was silently deleting control characters (U+0000-U+001F) that were not individually handled (\n, \t, \r, \b, \f). Per RFC 8259, these must be encoded as \uXXXX sequences to preserve data integrity. Replace the tr -d strip with a char-by-char loop that emits proper \uXXXX escapes for any remaining control characters. --- scripts/bash/common.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/bash/common.sh b/scripts/bash/common.sh index 826e740f00..2917bcc9e1 100644 --- a/scripts/bash/common.sh +++ b/scripts/bash/common.sh @@ -171,9 +171,21 @@ json_escape() { s="${s//$'\r'/\\r}" s="${s//$'\b'/\\b}" s="${s//$'\f'/\\f}" - # Strip remaining control characters (U+0000–U+001F) not individually escaped above - s=$(printf '%s' "$s" | tr -d '\000-\007\013\016-\037') - printf '%s' "$s" + # Escape any remaining U+0000-U+001F control characters as \uXXXX. + # Only single-byte characters can be JSON control chars; multi-byte UTF-8 + # sequences have first-byte values >= 0xC0 and are never control characters. + local i char code + local out="" + for (( i=0; i<${#s}; i++ )); do + char="${s:$i:1}" + code=$(LC_ALL=C printf '%d' "'$char" 2>/dev/null || echo 256) + if (( code >= 0 && code <= 31 )); then + out+=$(printf '\\u%04x' "$code") + else + out+="$char" + fi + done + printf '%s' "$out" } check_file() { [[ -f "$1" ]] && echo " ✓ $2" || echo " ✗ $2"; }