summaryrefslogtreecommitdiff
path: root/java/src/json/ext/Parser.rl
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2012-05-10 02:13:05 +0200
committerFlorian Frank <flori@ping.de>2012-05-10 02:47:37 +0200
commit00cb1bce00254249d1e312da885b89cd8f2e0299 (patch)
treed878290b1388c4c892410a3e143f8567609ad5d9 /java/src/json/ext/Parser.rl
parent2797901a526a5bc95167c7eedd6d19a39b7a2ce9 (diff)
downloadjson-00cb1bce00254249d1e312da885b89cd8f2e0299.tar.gz
enforce utf8 encoding in parsed stringsjruby-fix-encoding
Diffstat (limited to 'java/src/json/ext/Parser.rl')
-rw-r--r--java/src/json/ext/Parser.rl4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/src/json/ext/Parser.rl b/java/src/json/ext/Parser.rl
index 6d9d4f9..73062cf 100644
--- a/java/src/json/ext/Parser.rl
+++ b/java/src/json/ext/Parser.rl
@@ -647,6 +647,10 @@ public class Parser extends RubyObject {
}
if (cs >= JSON_string_first_final && result != null) {
+ RuntimeInfo info = RuntimeInfo.forRuntime(context.getRuntime());
+ if (info.encodingsSupported() && result instanceof RubyString) {
+ ((RubyString)result).force_encoding(context, info.utf8.get());
+ }
res.update(result, p + 1);
} else {
res.update(null, p + 1);