Skip to content

Escape JSON strings #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkvaluemeal wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Escape JSON strings #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093c7e8
Fix pb_to_json to properly escape strings.
google-labs-jules[bot] Jun 6, 2026
521e8d9
Merge pull request #1 from bkvaluemeal/fix-pb-to-json-escaping
bkvaluemeal Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions expected/pgproto_test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,3 +569,9 @@ ERROR: Field nonexistent not found in message CoverageMsg
-- 35. Test pb_insert error: Message not found
SELECT pb_insert('\x'::protobuf, ARRAY['NonExistentMessage', 'f', '0'], '1.23');
ERROR: Message not found in schema registry: NonExistentMessage
-- 36. Test pb_to_json escaping
SELECT pb_to_json(pb_insert('\x'::protobuf, ARRAY['CoverageMsg', 'str_arr', '0'], E'hello "world"\\\n\t\b\f\r'), 'CoverageMsg');
pb_to_json
---------------------------------------------
{"str_arr":["hello \"world\"\\\n\t\b\f\r"]}
(1 row)
3 changes: 3 additions & 0 deletions sql/pgproto_test.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,3 +342,6 @@ SELECT pb_insert('\x'::protobuf, ARRAY['NonExistentMessage', 'f', '0'], '1.23');




-- 36. Test pb_to_json escaping
SELECT pb_to_json(pb_insert('\x'::protobuf, ARRAY['CoverageMsg', 'str_arr', '0'], E'hello "world"\\\n\t\b\f\r'), 'CoverageMsg');
20 changes: 19 additions & 1 deletion src/json.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,25 @@ pb_to_json_inner(const char *ptr, const char *end, const char *msg_name, StringI
pb_to_json_inner(ptr, ptr + len, lookup.type_name, buf);
} else {
appendStringInfoChar(buf, '"');
appendBinaryStringInfo(buf, ptr, (int)len);
for (int i = 0; i < (int)len; i++) {
char c = ptr[i];
switch (c) {
case '"': appendStringInfoString(buf, "\\\""); break;
case '\\': appendStringInfoString(buf, "\\\\"); break;
case '\b': appendStringInfoString(buf, "\\b"); break;
case '\f': appendStringInfoString(buf, "\\f"); break;
case '\n': appendStringInfoString(buf, "\\n"); break;
case '\r': appendStringInfoString(buf, "\\r"); break;
case '\t': appendStringInfoString(buf, "\\t"); break;
default:
if ((unsigned char)c < 0x20) {
appendStringInfo(buf, "\\u%04x", (unsigned char)c);
} else {
appendStringInfoChar(buf, c);
}
break;
}
}
appendStringInfoChar(buf, '"');
}
ptr += len;
Expand Down