diff options
| author | Florian Frank <flori@ping.de> | 2011-12-01 08:42:49 +0100 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-12-01 08:42:49 +0100 |
| commit | 0eb6ed53a2cb24d5932690c2206511a0622ab10c (patch) | |
| tree | 8b082dca3a4c3c362ffb520b70978449a37dcfd9 /lib | |
| parent | b0ee15f984e3ff056f646d253b142c3e47a35e0f (diff) | |
| download | json-0eb6ed53a2cb24d5932690c2206511a0622ab10c.tar.gz | |
Small fix: JSON.load('') # => nil
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/json/common.rb | 3 | ||||
| -rw-r--r-- | lib/json/version.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/json/common.rb b/lib/json/common.rb index fcb1f82..cf7a8b9 100644 --- a/lib/json/common.rb +++ b/lib/json/common.rb @@ -313,7 +313,8 @@ module JSON source = source.to_io.read elsif source.respond_to?(:read) source = source.read - elsif source.nil? && opts[:quirks_mode] + end + if opts[:quirks_mode] && (source.nil? || source.empty?) source = 'null' end result = parse(source, opts) diff --git a/lib/json/version.rb b/lib/json/version.rb index ee9a95a..9272c53 100644 --- a/lib/json/version.rb +++ b/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.6.2' + VERSION = '1.6.3' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: |