diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 07:52:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 07:52:37 +0000 |
| commit | 5222cc1eac378cf3a0799cb615c646a21eedaf21 (patch) | |
| tree | b2d880e9a50ff423e1738278fe153440d40f9291 /ext | |
| parent | 3c508c9d9b1fed041c0efae7d996056efdf2fd50 (diff) | |
merge revision(s) 45291,45299,45314,45325: [Backport #9599]
* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
ext/fiddle/handle.c (fiddle_handle_free),
ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dl/cptr.c | 1 | ||||
| -rw-r--r-- | ext/dl/handle.c | 1 | ||||
| -rw-r--r-- | ext/fiddle/handle.c | 1 | ||||
| -rw-r--r-- | ext/fiddle/pointer.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/ext/dl/cptr.c b/ext/dl/cptr.c index 667c65172c..b315a46186 100644 --- a/ext/dl/cptr.c +++ b/ext/dl/cptr.c @@ -49,6 +49,7 @@ dlptr_free(void *ptr) (*(data->free))(data->ptr); } } + xfree(ptr); } static size_t diff --git a/ext/dl/handle.c b/ext/dl/handle.c index ef182e816f..6b90e089ee 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -38,6 +38,7 @@ dlhandle_free(void *ptr) if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){ dlclose(dlhandle->ptr); } + xfree(ptr); } static size_t diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c index 832ff3319a..4bb402bdfa 100644 --- a/ext/fiddle/handle.c +++ b/ext/fiddle/handle.c @@ -40,6 +40,7 @@ fiddle_handle_free(void *ptr) if( fiddle_handle->ptr && fiddle_handle->open && fiddle_handle->enable_close ){ dlclose(fiddle_handle->ptr); } + xfree(ptr); } static size_t diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c index 3667a84bd8..d115d3d131 100644 --- a/ext/fiddle/pointer.c +++ b/ext/fiddle/pointer.c @@ -65,6 +65,7 @@ fiddle_ptr_free(void *ptr) (*(data->free))(data->ptr); } } + xfree(ptr); } static size_t |