diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 15:20:35 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-10 15:20:35 +0000 |
commit | 23331a9697be86584477cd294b53241ef0be9511 (patch) | |
tree | 89e25c2fecb828b797ad7faa57bfd8a1f8c13616 /gc.c | |
parent | 3164eb68f4f40236357afc8b1733d94bc8eb49f1 (diff) | |
download | ruby-23331a9697be86584477cd294b53241ef0be9511.tar.gz |
ruby.h: fix possible memory leak
* include/ruby/ruby.h (Data_Make_Struct, TypedData_Make_Struct):
allocate wrapper data object before allocating DATA_PTR to get
rid of possible memory leak when the former failed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -1813,12 +1813,28 @@ rb_data_object_alloc(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_F } VALUE +rb_data_object_zalloc(VALUE klass, size_t size, RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree) +{ + VALUE obj = rb_data_object_alloc(klass, 0, dmark, dfree); + DATA_PTR(obj) = xcalloc(1, size); + return obj; +} + +VALUE rb_data_typed_object_alloc(VALUE klass, void *datap, const rb_data_type_t *type) { if (klass) Check_Type(klass, T_CLASS); return newobj_of(klass, T_DATA | (type->flags & ~T_MASK), (VALUE)type, (VALUE)1, (VALUE)datap); } +VALUE +rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type) +{ + VALUE obj = rb_data_typed_object_alloc(klass, 0, type); + DATA_PTR(obj) = xcalloc(1, size); + return obj; +} + size_t rb_objspace_data_type_memsize(VALUE obj) { |