merge -c 12113

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 4667cf7a6f..6d56027d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 22 20:53:02 2007  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/thread/thread.c (remove_one): Preserve List invariants;
+	  submitted by: MenTaLguY <mental AT rydia.net>
+	  in [ruby-core:10598] and [ruby-bugs:PR#9388].
+
 Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* distruby.rb: Add zip generation.
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
index d617185a26..b0badf11b8 100644
--- a/ext/thread/thread.c
+++ b/ext/thread/thread.c
@@ -163,13 +163,18 @@ static void
 remove_one(List *list, VALUE value)
 {
     Entry **ref;
+    Entry *prev;
     Entry *entry;
 
-    for (ref = &list->entries, entry = list->entries;
+    for (ref = &list->entries, prev = NULL, entry = list->entries;
               entry != NULL;
-              ref = &entry->next, entry = entry->next) {
+              ref = &entry->next, prev = entry, entry = entry->next) {
         if (entry->value == value) {
             *ref = entry->next;
+            list->size--;
+            if (!entry->next) {
+                list->last_entry = prev;
+            }
             recycle_entries(list, entry, entry);
             break;
         }
diff --git a/version.h b/version.h
index 08481717a2..e24e871ae7 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-03-19"
+#define RUBY_RELEASE_DATE "2007-05-22"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070319
-#define RUBY_PATCHLEVEL 4
+#define RUBY_RELEASE_CODE 20070522
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];