merges r23444 from trunk into ruby_1_9_1.

--
* ext/dl/lib/dl/callback.rb (DL#remove_callback_internal): ignore
  unbound function.  [ruby-dev:38474]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 841b194d6..1235998e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 16 17:57:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/lib/dl/callback.rb (DL#remove_callback_internal): ignore
+	  unbound function.  [ruby-dev:38474]
+
 Sat May 16 13:49:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* variable.c (rb_autoload_load): gets rid of false warning.
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
index d0b2c7a81..c8daaf632 100644
--- a/ext/dl/lib/dl/callback.rb
+++ b/ext/dl/lib/dl/callback.rb
@@ -48,7 +48,7 @@ module DL
         }
       }
     end
-    if( proc_entry[ctype][index] )
+    if( index and proc_entry[ctype][index] )
       proc_entry[ctype][index] = nil
       return true
     else
diff --git a/version.h b/version.h
index 580e57acf..9adfe31fe 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 143
+#define RUBY_PATCHLEVEL 144
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1