From 6dfd7395d07bd8ac75a183bbd7f87b3eae3bf3ba Mon Sep 17 00:00:00 2001 From: NIKHIL Date: Sun, 4 Oct 2026 03:38:30 +0530 Subject: [PATCH] core(persistence): emit valid JSON string escapes --- modules/core/src/persistence_json.cpp | 17 +++++++++++++---- modules/core/test/test_io.cpp | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/modules/core/src/persistence_json.cpp b/modules/core/src/persistence_json.cpp index c0b1a0be3e..852c79e265 100644 --- a/modules/core/src/persistence_json.cpp +++ b/modules/core/src/persistence_json.cpp @@ -95,7 +95,7 @@ public: void write(const char* key, const char* str, bool quote) { - char buf[CV_FS_MAX_LEN*4+16]; + char buf[CV_FS_MAX_LEN*6+16]; char* data = (char*)str; int i, len; @@ -114,18 +114,27 @@ public: for( i = 0; i < len; i++ ) { char c = str[i]; + const unsigned char byte = static_cast(c); switch ( c ) { case '\\': - case '\"': - case '\'': { *data++ = '\\'; *data++ = c; break; } + case '\"': { *data++ = '\\'; *data++ = c; break; } case '\n': { *data++ = '\\'; *data++ = 'n'; break; } case '\r': { *data++ = '\\'; *data++ = 'r'; break; } case '\t': { *data++ = '\\'; *data++ = 't'; break; } case '\b': { *data++ = '\\'; *data++ = 'b'; break; } case '\f': { *data++ = '\\'; *data++ = 'f'; break; } - default : { *data++ = c; } + default : + if (byte < 0x20) + { + static const char hex[] = "0123456789abcdef"; + *data++ = '\\'; *data++ = 'u'; *data++ = '0'; *data++ = '0'; + *data++ = hex[byte >> 4]; *data++ = hex[byte & 0xf]; + } + else + *data++ = c; + break; } } diff --git a/modules/core/test/test_io.cpp b/modules/core/test/test_io.cpp index cbd65e96fa..ee2b408b1a 100644 --- a/modules/core/test/test_io.cpp +++ b/modules/core/test/test_io.cpp @@ -1082,6 +1082,21 @@ TEST(Core_InputOutput, filestorage_json_comment) EXPECT_EQ(str, String("value")); } +TEST(Core_InputOutput, filestorage_json_escape_string) +{ + const String value = "O'Reilly\x01"; + FileStorage writer("test.json", FileStorage::WRITE | FileStorage::MEMORY); + writer << "text" << value; + const String json = writer.releaseAndGetString(); + + EXPECT_NE(String::npos, json.find("\"text\": \"O'Reilly\\u0001\"")); + + FileStorage reader(json, FileStorage::READ | FileStorage::MEMORY); + String restored; + reader["text"] >> restored; + EXPECT_EQ(value, restored); +} + TEST(Core_InputOutput, filestorage_utf8_bom) { EXPECT_NO_THROW(