naruse	2011-07-22 21:45:32 +0900 (Fri, 22 Jul 2011)

  New Revision: 32623

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32623

  Log:
    merge revision(s) 32586:
    
    * ext/dl/handle.c (dlhandle_sym): clear previous error with dlerror()
      before calling dlsym(). [ruby-dev:44091] [Bug #5021]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/dl/handle.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32622)
+++ ruby_1_9_3/ChangeLog	(revision 32623)
@@ -1,3 +1,8 @@
+Fri Jul 22 21:45:21 2011  NARUSE, Yui  <naruse@r...>
+
+	* ext/dl/handle.c (dlhandle_sym): clear previous error with dlerror()
+	  before calling dlsym(). [ruby-dev:44091] [Bug #5021]
+
 Fri Jul 22 19:05:47 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (rb_enc_symname2_p): get rid of potential out-of-bound
Index: ruby_1_9_3/ext/dl/handle.c
===================================================================
--- ruby_1_9_3/ext/dl/handle.c	(revision 32622)
+++ ruby_1_9_3/ext/dl/handle.c	(revision 32623)
@@ -305,6 +305,9 @@
     void (*func)();
 
     rb_secure(2);
+#ifdef HAVE_DLERROR
+    dlerror();
+#endif
     func = (void (*)())(VALUE)dlsym(handle, name);
     CHECK_DLERROR;
 #if defined(FUNC_STDCALL)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/