From 1bb22ded25b4148ad780a91a677cc9d35e11a1cc Mon Sep 17 00:00:00 2001 From: knu Date: Tue, 20 Mar 2007 22:26:18 +0000 Subject: [PATCH] * ext/thread/thread.c (remove_one): Preserve List invariants; submitted by: MenTaLguY in [ruby-core:10598] and [ruby-bugs:PR#9388]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/thread/thread.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1de0a2acb3..32e9289275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 21 07:21:24 2007 Akinori MUSHA + + * ext/thread/thread.c (remove_one): Preserve List invariants; + submitted by: MenTaLguY + in [ruby-core:10598] and [ruby-bugs:PR#9388]. + Tue Mar 20 22:54:50 2007 Yukihiro Matsumoto * marshal.c (w_extended): erroneous check condition when dump 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; }