1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allocate structs with wrapper

Browse Source 
* parse.y (rb_parser_new, ripper_s_allocate): allocate structs
  with making new wrapper objects and get rid of potential memory
  leak.

* variable.c (rb_autoload): ditto.

* ext/digest/digest.c (rb_digest_base_alloc): ditto.

* ext/strscan/strscan.c (strscan_s_allocate): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-05-16 12:56:48 +00:00
parent cb54008be6
commit 6fb9349d85
4 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/digest/digest.c
View File

@ -565,11 +565,10 @@ rb_digest_base_alloc(VALUE klass)
algo = get_digest_base_metadata(klass); algo = get_digest_base_metadata(klass);
pctx = xmalloc(algo->ctx_size); obj = rb_data_typed_object_zalloc(klass, algo->ctx_size, &digest_type);
pctx = RTYPEDDATA_DATA(obj);
algo_init(algo, pctx); algo_init(algo, pctx);
obj = TypedData_Wrap_Struct(klass, &digest_type, pctx);
return obj; return obj;
} }

4
ext/strscan/strscan.c
View File

@ -198,12 +198,12 @@ static VALUE
strscan_s_allocate(VALUE klass) strscan_s_allocate(VALUE klass)
{ {
struct strscanner *p; struct strscanner *p;
VALUE obj = TypedData_Make_Struct(klass, struct strscanner, &strscanner_type, p);
p = ZALLOC(struct strscanner);
CLEAR_MATCH_STATUS(p); CLEAR_MATCH_STATUS(p);
onig_region_init(&(p->regs)); onig_region_init(&(p->regs));
p->str = Qnil; p->str = Qnil;
return TypedData_Wrap_Struct(klass, &strscanner_type, p); return obj;
} }
/* /*

24
parse.y
View File

@ -10659,22 +10659,14 @@ rb_reserved_word(const char *str, unsigned int len)
return reserved_word(str, len); return reserved_word(str, len);
} }
static struct parser_params *
parser_new(void)
{
struct parser_params *p;
p = ZALLOC(struct parser_params);
parser_initialize(p);
return p;
}
VALUE VALUE
rb_parser_new(void) rb_parser_new(void)
{ {
struct parser_params *p = parser_new(); struct parser_params *p;
VALUE parser = TypedData_Make_Struct(0, struct parser_params,
return TypedData_Wrap_Struct(0, &parser_data_type, p); &parser_data_type, p);
parser_initialize(p);
return parser;
} }
#endif #endif
@ -11124,10 +11116,8 @@ static VALUE
ripper_s_allocate(VALUE klass) ripper_s_allocate(VALUE klass)
{ {
struct parser_params *p; struct parser_params *p;
VALUE self; VALUE self = TypedData_Make_Struct(klass, struct parser_params,
&parser_data_type, p);
p = ZALLOC(struct parser_params);
self = TypedData_Wrap_Struct(klass, &parser_data_type, p);
p->value = self; p->value = self;
return self; return self;
} }

3
variable.c
View File

@ -1682,12 +1682,11 @@ rb_autoload(VALUE mod, ID id, const char *file)
FL_UNSET(fn, FL_TAINT); FL_UNSET(fn, FL_TAINT);
OBJ_FREEZE(fn); OBJ_FREEZE(fn);
ele = ALLOC(struct autoload_data_i); ad = TypedData_Make_Struct(0, struct autoload_data_i, &autoload_data_i_type, ele);
ele->feature = fn; ele->feature = fn;
ele->safe_level = rb_safe_level(); ele->safe_level = rb_safe_level();
ele->thread = Qnil; ele->thread = Qnil;
ele->value = Qundef; ele->value = Qundef;
ad = TypedData_Wrap_Struct(0, &autoload_data_i_type, ele);
st_insert(tbl, (st_data_t)id, (st_data_t)ad); st_insert(tbl, (st_data_t)id, (st_data_t)ad);
} }