From 35c546104b00e1e773bcdfd59bb0cd580c85b190 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 14 Feb 2012 20:09:27 +0000 Subject: merge revision(s) 32712,32718,32719: [Backport #6014] * ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark): workaround to mark wrapped object. this is not a true fix, because [Bug #4929] is caused by the interface design of DL. * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition. * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition. * ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 9375b885cb..4041ae169f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Feb 15 05:08:25 2012 Nobuyoshi Nakada + + * ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall. + + * ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark): + workaround to mark wrapped object. this is not a true fix, + because [Bug #4929] is caused by the interface design of DL. + Wed Feb 15 05:04:47 2012 Nobuyoshi Nakada * ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer -- cgit v1.2.3