From 1daf775db96412d0a7fc3905d470846a59a9ecbe Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 8 Oct 2008 06:01:48 +0000 Subject: * ext/json/lib/json/pure/parser.rb (JSON::Pure::Parser#parse_string): force_encoding("UTF-8"). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/json/lib/json/pure/parser.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 973a41c20..a635c54b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 8 15:00:22 2008 NARUSE, Yui + + * ext/json/lib/json/pure/parser.rb + (JSON::Pure::Parser#parse_string): force_encoding("UTF-8"). + Wed Oct 8 11:56:15 2008 NARUSE, Yui * lib/test/unit/assertions.rb: assert_nothing_thrown, diff --git a/ext/json/lib/json/pure/parser.rb b/ext/json/lib/json/pure/parser.rb index a0ab3075f..9c3fea91d 100644 --- a/ext/json/lib/json/pure/parser.rb +++ b/ext/json/lib/json/pure/parser.rb @@ -146,7 +146,7 @@ module JSON raise JSON::ParserError, "partial character in source" if stack res.pack("U*") end - end + end.force_encoding("UTF-8") else UNPARSED end -- cgit