From 4d059bf9f5f10f3d3088de49fc87e5555db7770d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 28 May 2015 07:17:55 +0000 Subject: generator.c: allocate structs with wrapper * ext/json/generator/generator.c (cState_s_allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/json/generator/generator.c | 11 +++-------- ext/json/generator/generator.h | 5 ++--- test/json/test_json_generate.rb | 13 +++++++++++++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c index baf5360bb1..a135e28348 100644 --- a/ext/json/generator/generator.c +++ b/ext/json/generator/generator.c @@ -526,16 +526,11 @@ static const rb_data_type_t JSON_Generator_State_type = { }; #endif -static JSON_Generator_State *State_allocate(void) -{ - JSON_Generator_State *state = ZALLOC(JSON_Generator_State); - return state; -} - static VALUE cState_s_allocate(VALUE klass) { - JSON_Generator_State *state = State_allocate(); - return TypedData_Wrap_Struct(klass, &JSON_Generator_State_type, state); + JSON_Generator_State *state; + return TypedData_Make_Struct(klass, JSON_Generator_State, + &JSON_Generator_State_type, state); } /* diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h index 416159a9c5..298c0a4965 100644 --- a/ext/json/generator/generator.h +++ b/ext/json/generator/generator.h @@ -112,7 +112,6 @@ static VALUE mFalseClass_to_json(int argc, VALUE *argv, VALUE self); static VALUE mNilClass_to_json(int argc, VALUE *argv, VALUE self); static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self); static void State_free(void *state); -static JSON_Generator_State *State_allocate(void); static VALUE cState_s_allocate(VALUE klass); static VALUE cState_configure(VALUE self, VALUE opts); static VALUE cState_to_h(VALUE self); @@ -156,11 +155,11 @@ static inline void *ruby_zalloc(size_t n) return p; } #endif -#ifdef TypedData_Wrap_Struct +#ifdef TypedData_Make_Struct static const rb_data_type_t JSON_Generator_State_type; #define NEW_TYPEDDATA_WRAPPER 1 #else -#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, NULL, State_free, json) +#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, State_free, json) #define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json) #endif diff --git a/test/json/test_json_generate.rb b/test/json/test_json_generate.rb index 1834290944..ce470db3c2 100644 --- a/test/json/test_json_generate.rb +++ b/test/json/test_json_generate.rb @@ -344,4 +344,17 @@ EOT assert_equal '[""]', JSON.generate([s.new]) end end + + if EnvUtil.gc_stress_to_class? + def assert_no_memory_leak(code, *rest, **opt) + code = "8.times {20_000.times {begin #{code}; rescue NoMemoryError; end}; GC.start}" + super(["-rjson/ext/generator"], + "GC.add_stress_to_class(JSON::Ext::Generator::State); "\ + "#{code}", code, *rest, rss: true, limit: 1.1, **opt) + end + + def test_no_memory_leak_allocate + assert_no_memory_leak("JSON::Ext::Generator::State.allocate") + end + end end -- cgit v1.2.3