From f7ff06d98319471c1986a3b41cac5985e830da38 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 11 Mar 2007 16:01:25 +0000
Subject: * ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,  
 DL::Importable::Internal::callback): Avoid race condition for an   instance
 variable; submitted by sheepman <sheepman AT   sheepman.sakura.ne.jp> in
 [ruby-dev:30530].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 7 +++++++
 ext/dl/lib/dl/import.rb | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d1d1e04690..9a0435d16c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 12 00:59:19 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
+	  DL::Importable::Internal::callback): Avoid race condition for an
+	  instance variable; submitted by sheepman <sheepman AT
+	  sheepman.sakura.ne.jp> in [ruby-dev:30530].
+
 Sun Mar 11 18:57:50 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* misc/README: Add a note about ruby-electric.el. 
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 63c9b2c050..01ee2490e8 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -87,7 +87,7 @@ module DL
 	  "  rs = dec.call(rs) if (dec && rs)",
 	  "  @retval = r",
 	  "  @args   = rs",
-	  "  @retval",
+	  "  r",
 	  "}",
 	].join("\n"))
 
@@ -169,7 +169,7 @@ module DL
 	  "  rs = dec.call(rs) if dec",
 	  "  @retval = r",
 	  "  @args   = rs",
-	  "  return @retval",
+	  "  return r",
 	  "end",
 	  "module_function :#{mname}",
 	].join("\n")
-- 
cgit v1.2.3