This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
The following commit(s) were added to refs/heads/master by this push:
new a799c934 Escape control characters in JSONLayout data (#512)
a799c934 is described below
commit a799c934545311ff4179c68e16bbeb02b5c66348
Author: Stephen Webb <[email protected]>
AuthorDate: Tue Jul 22 11:32:03 2025 +1000
Escape control characters in JSONLayout data (#512)
---
src/main/cpp/jsonlayout.cpp | 52 ++++++++++++++++++-----------------------
src/test/cpp/jsonlayouttest.cpp | 14 +++++++++++
2 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/src/main/cpp/jsonlayout.cpp b/src/main/cpp/jsonlayout.cpp
index d8d062d7..3e0abf48 100644
--- a/src/main/cpp/jsonlayout.cpp
+++ b/src/main/cpp/jsonlayout.cpp
@@ -215,32 +215,31 @@ void JSONLayout::appendQuotedEscapedString(LogString& buf,
void JSONLayout::appendItem(const LogString& input, LogString& buf)
{
- /* add leading quote */
- buf.push_back(0x22);
-
- logchar specialChars[] =
+ auto toHexDigit = [](int ch) -> int
{
- 0x08, /* \b backspace */
- 0x09, /* \t tab */
- 0x0a, /* \n newline */
- 0x0c, /* \f form feed */
- 0x0d, /* \r carriage return */
- 0x22, /* \" double quote */
- 0x5c, /* \\ backslash */
- 0x00 /* terminating NULL for C-strings */
+ return (10 <= ch ? (0x61 - 10) : 0x30) + ch;
};
+ /* add leading quote */
+ buf.push_back(0x22);
size_t start = 0;
- size_t found = input.find_first_of(specialChars, start);
+ size_t index = 0;
- while (found != LogString::npos)
+ for (int ch : input)
{
- if (found > start)
+ if (0x22 == ch || 0x5c == ch)
+ ;
+ else if (0x20 <= ch)
+ {
+ ++index;
+ continue;
+ }
+ if (start < index)
{
- buf.append(input, start, found - start);
+ buf.append(input, start, index - start);
}
- switch (input[found])
+ switch (ch)
{
case 0x08:
/* \b backspace */
@@ -285,20 +284,15 @@ void JSONLayout::appendItem(const LogString& input,
LogString& buf)
break;
default:
- buf.push_back(input[found]);
+ buf.push_back(0x5c);
+ buf.push_back(0x75); // 'u'
+ buf.push_back(toHexDigit((ch & 0xF000) >> 12));
+ buf.push_back(toHexDigit((ch & 0xF00) >> 8));
+ buf.push_back(toHexDigit((ch & 0xF0) >> 4));
+ buf.push_back(toHexDigit(ch & 0xF));
break;
}
-
- start = found + 1;
-
- if (found < input.size())
- {
- found = input.find_first_of(specialChars, start);
- }
- else
- {
- found = LogString::npos;
- }
+ start = ++index;
}
if (start < input.size())
diff --git a/src/test/cpp/jsonlayouttest.cpp b/src/test/cpp/jsonlayouttest.cpp
index fda39fca..75f17dc0 100644
--- a/src/test/cpp/jsonlayouttest.cpp
+++ b/src/test/cpp/jsonlayouttest.cpp
@@ -163,6 +163,20 @@ public:
appendQuotedEscapedString(cr_escaped, cr);
LOGUNIT_ASSERT_EQUAL(cr_expected, cr_escaped);
+
+ logchar sub[] = {0x1a, 0x00};
+ logchar sub_expected[] = {0x22, 0x5c, 'u', 0x30, 0x30, 0x31,
0x61, 0x22, 0x00}; /* SUB */
+ LogString sub_escaped;
+
+ appendQuotedEscapedString(sub_escaped, sub);
+ LOGUNIT_ASSERT_EQUAL(sub_expected, sub_escaped);
+
+ logchar esc[] = {0x1e, 0x00};
+ logchar esc_expected[] = {0x22, 0x5c, 'u', 0x30, 0x30, 0x31,
0x65, 0x22, 0x00}; /* ESC */
+ LogString esc_escaped;
+
+ appendQuotedEscapedString(esc_escaped, esc);
+ LOGUNIT_ASSERT_EQUAL(esc_expected, esc_escaped);
}
/**
