Skip to content

fix(objective-c): escape control characters in string literals #3447

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

Merged
schani merged 8 commits into from
Sep 5, 2026
Merged

fix(objective-c): escape control characters in string literals #3447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4630d52
fix(objective-c): escape control characters in string literals
schani Sep 5, 2026
b7096c6
fix(objective-c): avoid restricted callback parameter name
schani Sep 5, 2026
cda5042
test(objective-c): round-trip control character regression
schani Sep 5, 2026
18ebf2d
test: avoid PHP-reserved NUL prefix in control-character case
schani Sep 5, 2026
20d46bb
test(objective-c): exercise control escapes through enum values
schani Sep 5, 2026
00b8740
test(objective-c): focus inferred enum on control characters
schani Sep 5, 2026
3597ee8
test(kotlin): skip unsupported control-character enums in Jackson
schani Sep 5, 2026
e67efc0
test(kotlin): skip unsupported control-character enums in Klaxon
schani Sep 5, 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
14 changes: 13 additions & 1 deletion packages/quicktype-core/src/language/Objective-C/ObjectiveCRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,19 @@ import {
type MemoryAttribute = "assign" | "strong" | "copy";

const objectiveCStringEscape = (s: string): string =>
stringEscape(s).replace(/\\u0000/g, "\\000");
stringEscape(s).replace(
/\\\\|\\u00([0-9a-f]{2})/g,
(escaped, code: string | undefined) =>
code === undefined
? escaped
: Array.from(
new TextEncoder().encode(
String.fromCharCode(Number.parseInt(code, 16)),
),
)
.map((byte) => `\\${byte.toString(8).padStart(3, "0")}`)
.join(""),
);

const DEBUG = false;

Expand Down
15 changes: 15 additions & 0 deletions test/inputs/json/samples/objc-control-characters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"literal": "\\u001b",
"values": [
"c0\u0001\u001b\u001f",
"c1\u007f\u0080\u0085\u009f",
"c0\u0001\u001b\u001f",
"c1\u007f\u0080\u0085\u009f",
"c0\u0001\u001b\u001f",
"c1\u007f\u0080\u0085\u009f",
"c0\u0001\u001b\u001f",
"c1\u007f\u0080\u0085\u009f",
"c0\u0001\u001b\u001f",
"c1\u007f\u0080\u0085\u009f"
]
}
10 changes: 7 additions & 3 deletions test/languages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,8 +914,7 @@ export const ObjectiveCLanguage: Language = {
output: "QTTopLevel.m",
topLevel: "QTTopLevel",
skipJSON: [
// Almost all strings work except any containing \u001b
// See https://goo.gl/L8HfUP
// Foundation drops BOM object keys during JSON decoding.
"blns-object.json",
],
skipMiscJSON: false,
Expand Down Expand Up @@ -1267,6 +1266,8 @@ export const KotlinLanguage: Language = {
output: "TopLevel.kt",
topLevel: "TopLevel",
skipJSON: [
// Klaxon emits unescaped control characters in enum values.
"objc-control-characters.json",
// Some odd property names prevent Klaxon from mapping to constructors
// https://github.com/cbeust/klaxon/issues/146
"blns-object.json",
Expand Down Expand Up @@ -1358,7 +1359,10 @@ export const KotlinJacksonLanguage: Language = {
],
output: "TopLevel.kt",
topLevel: "TopLevel",
skipJSON: [],
skipJSON: [
// The enum serializer does not escape control characters.
"objc-control-characters.json",
],
skipSchema: ["keyword-unions.schema"],
skipMiscJSON: false,
rendererOptions: { framework: "jackson" },
Expand Down
Loading