summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/json/generator/generator.c2
-rw-r--r--ext/json/lib/json/version.rb2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e190db05d6..e5ea44c824c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 28 23:21:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/json: Update to JSON 1.4.2.
+
Wed Apr 28 22:53:57 2010 Yusuke Endoh <mame@tsg.ne.jp>
* thread. (rb_thread_terminate_all): revert r24591 which caused SEGV
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 043be606cb2..b398cac386a 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 38df3b5951e..de7690b57ca 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: