diff options
| author | Maxime RETY <maximerety@macbook-de-maxime-rety.local> | 2010-06-14 16:05:49 +0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-02-02 18:57:48 -0200 |
| commit | 68e3fb81090ba67575e513407fc2463dba3b002b (patch) | |
| tree | 39b1687fe614e9b57739bb6659d5e048e52151b6 /activesupport | |
| parent | 8bfa8e7cbea1fb65b180260c55a7f146efbd5b05 (diff) | |
| download | rails-68e3fb81090ba67575e513407fc2463dba3b002b.tar.gz rails-68e3fb81090ba67575e513407fc2463dba3b002b.tar.bz2 rails-68e3fb81090ba67575e513407fc2463dba3b002b.zip | |
Fix JSON decoding of newline character with Yaml backend [#3479 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/json/backends/yaml.rb | 8 | ||||
| -rw-r--r-- | activesupport/test/json/decoding_test.rb | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/json/backends/yaml.rb b/activesupport/lib/active_support/json/backends/yaml.rb index c7ed931c1b..b1dd2a8107 100644 --- a/activesupport/lib/active_support/json/backends/yaml.rb +++ b/activesupport/lib/active_support/json/backends/yaml.rb @@ -54,7 +54,9 @@ module ActiveSupport json.gsub(/\\([\\\/]|u[[:xdigit:]]{4})/) do ustr = $1 if ustr.start_with?('u') - [ustr[1..-1].to_i(16)].pack("U") + char = [ustr[1..-1].to_i(16)].pack("U") + # "\n" needs extra escaping due to yaml formatting + char == "\n" ? "\\n" : char elsif ustr == '\\' '\\\\' else @@ -75,7 +77,9 @@ module ActiveSupport chunk.gsub!(/\\([\\\/]|u[[:xdigit:]]{4})/) do ustr = $1 if ustr.start_with?('u') - [ustr[1..-1].to_i(16)].pack("U") + char = [ustr[1..-1].to_i(16)].pack("U") + # "\n" needs extra escaping due to yaml formatting + char == "\n" ? "\\n" : char elsif ustr == '\\' '\\\\' else diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb index a0beb97537..613c7531d9 100644 --- a/activesupport/test/json/decoding_test.rb +++ b/activesupport/test/json/decoding_test.rb @@ -41,7 +41,11 @@ class TestJSONDecoding < ActiveSupport::TestCase [{'d' => Date.new(1970, 1, 1), 's' => ' escape'},{'d' => Date.new(1970, 1, 1), 's' => ' escape'}], %q([{"d":"1970-01-01","s":"http:\/\/example.com"},{"d":"1970-01-01","s":"http:\/\/example.com"}]) => [{'d' => Date.new(1970, 1, 1), 's' => 'http://example.com'}, - {'d' => Date.new(1970, 1, 1), 's' => 'http://example.com'}] + {'d' => Date.new(1970, 1, 1), 's' => 'http://example.com'}], + # tests escaping of "\n" char with Yaml backend + %q("\n") => "\n", + %q("\u000a") => "\n", + %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"} } # load the default JSON backend |