kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parser.rl: allocate structs with wrapper

Browse source 
* ext/json/parser/parser.rl (cJSON_parser_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@50660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-05-28 07:17:42 +00:00
parent 828de1a06d
commit cbf902fc33
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/json/parser/parser.c
View file

@ -2110,14 +2110,6 @@ static VALUE cParser_parse(VALUE self)
}
}
static JSON_Parser *JSON_allocate(void)
{
JSON_Parser *json = ZALLOC(JSON_Parser);
json->fbuffer = fbuffer_alloc(0);
return json;
}
static void JSON_mark(void *ptr)
{
JSON_Parser *json = ptr;
@ -2154,8 +2146,10 @@ static const rb_data_type_t JSON_Parser_type = {
static VALUE cJSON_parser_s_allocate(VALUE klass)
{
JSON_Parser *json = JSON_allocate();
return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json);
JSON_Parser *json;
VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
json->fbuffer = fbuffer_alloc(0);
return obj;
}
/*

5
ext/json/parser/parser.h
View file

@ -68,7 +68,6 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
static VALUE convert_encoding(VALUE source);
static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self);
static VALUE cParser_parse(VALUE self);
static JSON_Parser *JSON_allocate(void);
static void JSON_mark(void *json);
static void JSON_free(void *json);
static VALUE cJSON_parser_s_allocate(VALUE klass);
@ -82,11 +81,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_Parser_type;
#define NEW_TYPEDDATA_WRAPPER 1
#else
#define TypedData_Wrap_Struct(klass, ignore, json) Data_Wrap_Struct(klass, JSON_mark, JSON_free, json)
#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, JSON_free, json)
#define TypedData_Get_Struct(self, JSON_Parser, ignore, json) Data_Get_Struct(self, JSON_Parser, json)
#endif

14
ext/json/parser/parser.rl
View file

@ -833,14 +833,6 @@ static VALUE cParser_parse(VALUE self)
}
}
static JSON_Parser *JSON_allocate(void)
{
JSON_Parser *json = ZALLOC(JSON_Parser);
json->fbuffer = fbuffer_alloc(0);
return json;
}
static void JSON_mark(void *ptr)
{
JSON_Parser *json = ptr;
@ -877,8 +869,10 @@ static const rb_data_type_t JSON_Parser_type = {
static VALUE cJSON_parser_s_allocate(VALUE klass)
{
JSON_Parser *json = JSON_allocate();
return TypedData_Wrap_Struct(klass, &JSON_Parser_type, json);
JSON_Parser *json;
VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
json->fbuffer = fbuffer_alloc(0);
return obj;
}
/*

13
test/json/test_json.rb
View file

@ -560,4 +560,17 @@ EOT
assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
assert_include(e.message, json, bug10705)
end if defined?(Encoding::UTF_8)
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/parser"],
"GC.add_stress_to_class(JSON::Ext::Parser); "\
"#{code}", code, *rest, rss: true, limit: 1.1, **opt)
end
def test_no_memory_leak_allocate
assert_no_memory_leak("JSON::Ext::Parser.allocate")
end
end
end