summaryrefslogtreecommitdiff
path: root/ext/json
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-28 14:26:30 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-28 14:26:30 +0000
commitdc22009c266e27cb466e1a72fac352c469ca1fe3 (patch)
tree8398814ed9ab817dc440e94b65ac449d91c6f470 /ext/json
parent97cfd1869c2618ec52aa23397ded36df2a9a5d78 (diff)
* ext/json: Update to JSON 1.4.2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json')
-rw-r--r--ext/json/generator/generator.c2
-rw-r--r--ext/json/lib/json/version.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 043be60..b398cac 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -921,7 +921,7 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth)
generate_json(buffer, self, state, obj, NIL_P(depth) ? 0 : FIX2INT(depth));
result = rb_str_new(FBUFFER_PAIR(buffer));
- fbuffer_free_only_buffer(buffer);
+ fbuffer_free(buffer);
FORCE_UTF8(result);
return result;
}
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 38df3b5..de7690b 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,6 +1,6 @@
module JSON
# JSON version
- VERSION = '1.4.1'
+ VERSION = '1.4.2'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: