Skip to content

[Go] Escape control characters as \u00XX in generated flyweight JSON strings #1193

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
slachiewicz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Go] Escape control characters as \u00XX in generated flyweight JSON strings #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions gocode/flyweight/src/baseline/JsonEscapedString_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package baseline

import (
"encoding/json"
"testing"
)

func TestJsonEscapedStringEscapesControlCharacters(t *testing.T) {
var data [256]byte
var in Car
in.WrapForEncode(data[:], 0, uint64(len(data)))
in.FuelFiguresCount(0)
in.PerformanceFiguresCount(0)
in.PutManufacturer("a\x01\"b\x1f").
PutModel("Civic").
PutActivationCode("x")

var out Car
out.WrapForDecode(data[:], 0, uint64(in.SbeBlockLength()), uint64(in.SbeSchemaVersion()), uint64(len(data)))
out.FuelFigures()
out.PerformanceFigures()

escaped := out.GetManufacturerAsJsonEscapedString()
if escaped != `a\u0001\"b\u001f` {
t.Fatalf("unexpected escaped string: %s", escaped)
}

var decoded string
if err := json.Unmarshal([]byte(`"`+escaped+`"`), &decoded); err != nil || decoded != "a\x01\"b\x1f" {
t.Fatalf("escaped string does not round trip through JSON: %q, %v", decoded, err)
}
}
2 changes: 1 addition & 1 deletion .../main/java/uk/co/real_logic/sbe/generation/golang/flyweight/GolangFlyweightGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,7 @@ private void generateJsonEscapedStringGetter(
indent + "\t\t\toss.WriteString(\"\\\\t\")\n\n" +
indent + "\t\tdefault:\n" +
indent + "\t\t\tif '\\x00' <= c && c <= '\\x1f' {\n" +
indent + "\t\t\t\tfmt.Fprintf(&oss, \"%%x\", c)\n" +
indent + "\t\t\t\tfmt.Fprintf(&oss, \"\\\\u%%04x\", c)\n" +
indent + "\t\t\t} else {\n" +
indent + "\t\t\t\toss.WriteString(string(c))\n" +
indent + "\t\t\t}\n" +
Expand Down