From 9dab5bc3b0404fe183f13c0b1c3351eab1bf257a Mon Sep 17 00:00:00 2001 From: ttate Date: Mon, 5 Aug 2002 01:24:13 +0000 Subject: [PATCH] Multiple call of the initialize. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dl/handle.c | 3 +++ ext/dl/ptr.c | 4 ++++ ext/dl/sym.c | 2 ++ 3 files changed, 9 insertions(+) diff --git a/ext/dl/handle.c b/ext/dl/handle.c index 0ba4397010..4b0a129793 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -75,6 +75,9 @@ rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self) }; #endif Data_Get_Struct(self, struct dl_handle, dlhandle); + if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){ + dlclose(dlhandle->ptr); + } dlhandle->ptr = ptr; dlhandle->open = 1; dlhandle->enable_close = 0; diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c index 1a31861c8f..149f33e4e5 100644 --- a/ext/dl/ptr.c +++ b/ext/dl/ptr.c @@ -202,6 +202,10 @@ rb_dlptr_initialize(int argc, VALUE argv[], VALUE self) if( p ){ Data_Get_Struct(self, struct ptr_data, data); + if( data->ptr && data->free ){ + /* Free previous memory. Use of inappropriate initialize may cause SEGV. */ + (*(data->free))(data->ptr); + } data->ptr = p; data->size = s; data->free = f; diff --git a/ext/dl/sym.c b/ext/dl/sym.c index 7e269b7c9e..7531c7969f 100644 --- a/ext/dl/sym.c +++ b/ext/dl/sym.c @@ -158,6 +158,8 @@ rb_dlsym_initialize(int argc, VALUE argv[], VALUE self) if( saddr ){ Data_Get_Struct(self, struct sym_data, data); + if( data->name ) free(data->name); + if( data->type ) free(data->type); data->func = saddr; data->name = sname ? strdup(sname) : 0; data->type = stype ? strdup(stype) : 0;