From 73469460910239659f7a2abdbdec409bfefe12a5 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Apr 2009 14:03:03 +0000 Subject: merges r22891 from trunk into ruby_1_9_1. -- * ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol name. [ruby-dev:38150] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/dl/handle.c | 12 +----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 674a56034..7bd2266fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 11 20:13:38 2009 Nobuyoshi Nakada + + * ext/dl/handle.c (rb_dlhandle_sym): RTLD_NEXT is not for symbol + name. [ruby-dev:38150] + Wed Mar 11 13:03:12 2009 Nobuyoshi Nakada * ext/dl/handle.c (rb_dlhandle_sym): fixed heap corruption. diff --git a/ext/dl/handle.c b/ext/dl/handle.c index aa051a9df..ee3c64498 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -140,17 +140,7 @@ rb_dlhandle_sym(VALUE self, VALUE sym) rb_secure(2); - if( sym == Qnil ){ -#if defined(RTLD_NEXT) - name = RTLD_NEXT; -#else - name = NULL; -#endif - } - else{ - name = StringValuePtr(sym); - } - + name = StringValuePtr(sym); Data_Get_Struct(self, struct dl_handle, dlhandle); if( ! dlhandle->open ){ -- cgit