summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/dl/handle.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fd6eb46e54..5b32f7419f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 22 21:45:21 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* parse.y (rb_enc_symname2_p): get rid of potential out-of-bound
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index ce04acbe21..eea8697e06 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -305,6 +305,9 @@ dlhandle_sym(void *handle, const char *name)
void (*func)();
rb_secure(2);
+#ifdef HAVE_DLERROR
+ dlerror();
+#endif
func = (void (*)())(VALUE)dlsym(handle, name);
CHECK_DLERROR;
#if defined(FUNC_STDCALL)