NULLify the destructor field when a thread key is deleted. This

allegedly fixes the following (haven't tested it myself):

valgrind: vg_scheduler.c:3454 (scheduler_sanity): Assertion
`vg_thread_keys[i].destructor == ((void *)0)' failed.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1356

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 697a4df74b2967e3a6b46b6835c35c2f3cd83d03..a6a9116d70e8c3214fb1ae92cc9c8912ddf47e7c 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -2903,6 +2903,7 @@ void do_pthread_key_delete ( ThreadId tid, pthread_key_t key )
    }
 
    vg_thread_keys[key].inuse = False;
+   vg_thread_keys[key].destructor = NULL;
    SET_EDX(tid, 0);
 }