summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-08 06:01:48 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-08 06:01:48 +0000
commit87259f9a5f19eb5c568079c33360e5fd15772938 (patch)
tree994373543b3a7e0df5d8cb31b000d7effeef820d
parentccf184d9e472998365d2bd009557919dd4c00a68 (diff)
* ext/json/lib/json/pure/parser.rb
(JSON::Pure::Parser#parse_string): force_encoding("UTF-8"). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/json/lib/json/pure/parser.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 973a41c..a635c54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 8 15:00:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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 <naruse@ruby-lang.org>
* 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 a0ab307..9c3fea9 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