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.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ext/json/generator/generator.h') 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 -- cgit v1.2.3