diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-20 22:26:18 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-20 22:26:18 +0000 |
commit | 1bb22ded25b4148ad780a91a677cc9d35e11a1cc (patch) | |
tree | f929580f5c1b83ea1d1c1439674e05920d0807ad /ext | |
parent | 59aac16283e58c9c43461af62d8739451fc2142d (diff) |
* 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].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/thread/thread.c | 9 |
1 files changed, 7 insertions, 2 deletions
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; } |