Skip to content
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

Jump to bottom

Use UTF8 when reading json/msgpack bytes #464

Merged
merged 2 commits into from
Mar 12, 2023
Merged

Use UTF8 when reading json/msgpack bytes #464

merged 2 commits into from
Mar 12, 2023

Conversation

lihaoyi
Copy link
Member

@lihaoyi lihaoyi commented Mar 12, 2023 •
edited
Loading

Fixes #413

We already hard-code support for UTF-8 when rendering JSON and MessagePack

upickle/core/src/upickle/core/RenderUtils.scala

Line 28 in 6e2d571

final def escapeByte(unicodeCharBuilder: upickle.core.CharBuilder,

upickle/upack/src/upack/MsgPackWriter.scala

Line 166 in 6e2d571

val strBytes = s.toString.getBytes(java.nio.charset.StandardCharsets.UTF_8)
, so the only thing missing is to ensure we use UTF-8 when reading

Added some simple tests under upickle.jvm[_].testNonUtf8 running with -Dfile.encoding=US-ASCII exercise these code paths

@lihaoyi lihaoyi changed the title Use UTF8 when reading json bytes Use UTF8 when reading json/msgpack bytes Mar 12, 2023
@lihaoyi lihaoyi marked this pull request as ready for review March 12, 2023 07:29
@lihaoyi lihaoyi merged commit a6fea69 into main Mar 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

read/write uses defaultCharset to create String
1 participant
@lihaoyi