Merge branch 'libpthread-moved' into upstream-merged

4 files changed, 27 insertions, 2 deletions

diff --git a/libpthread/sysdeps/hurd/pt-destroy-specific.c b/libpthread/sysdeps/hurd/pt-destroy-specific.c
index 23c7fbc0..f7896e5e 100644
--- a/libpthread/sysdeps/hurd/pt-destroy-specific.c
+++ b/libpthread/sysdeps/hurd/pt-destroy-specific.c
@@ -48,7 +48,7 @@ __pthread_destroy_specific (struct __pthread *thread)
 	  void *value;
 
 	  if (__pthread_key_destructors[i] == PTHREAD_KEY_INVALID)
-	    break;
+	    continue;
 
 	  value = hurd_ihash_find (thread->thread_specifics, i);
 	  if (value)
diff --git a/libpthread/sysdeps/hurd/pt-getspecific.c b/libpthread/sysdeps/hurd/pt-getspecific.c
index 30605984..71ec63c6 100644
--- a/libpthread/sysdeps/hurd/pt-getspecific.c
+++ b/libpthread/sysdeps/hurd/pt-getspecific.c
@@ -27,7 +27,9 @@ pthread_getspecific (pthread_key_t key)
 {
   struct __pthread *self;
 
-  assert (key < __pthread_key_count);
+  if (key < 0 || key >= __pthread_key_count
+      || __pthread_key_destructors[key] == PTHREAD_KEY_INVALID)
+    return NULL;
 
   self = _pthread_self ();
   if (! self->thread_specifics)
diff --git a/libpthread/sysdeps/hurd/pt-key-delete.c b/libpthread/sysdeps/hurd/pt-key-delete.c
index 2426bb11..9d88647e 100644
--- a/libpthread/sysdeps/hurd/pt-key-delete.c
+++ b/libpthread/sysdeps/hurd/pt-key-delete.c
@@ -35,8 +35,27 @@ pthread_key_delete (pthread_key_t key)
     err = EINVAL;
   else
     {
+      int i;
+
       __pthread_key_destructors[key] = PTHREAD_KEY_INVALID;
       __pthread_key_invalid_count ++;
+
+      pthread_rwlock_rdlock (&__pthread_threads_lock);
+      for (i = 0; i < __pthread_num_threads; ++i)
+	{
+	  struct __pthread *t;
+
+	  t = __pthread_threads[i];
+
+	  if (t == NULL)
+	    continue;
+
+	  /* Just remove the key, no need to care whether it was
+	     already there. */
+	  if (t->thread_specifics)
+	    hurd_ihash_remove (t->thread_specifics, key);
+	}
+      pthread_rwlock_unlock (&__pthread_threads_lock);
     }
 
   __pthread_mutex_unlock (&__pthread_key_lock);
diff --git a/libpthread/sysdeps/hurd/pt-setspecific.c b/libpthread/sysdeps/hurd/pt-setspecific.c
index 89ca4d7f..d0b7302f 100644
--- a/libpthread/sysdeps/hurd/pt-setspecific.c
+++ b/libpthread/sysdeps/hurd/pt-setspecific.c
@@ -28,6 +28,10 @@ pthread_setspecific (pthread_key_t key, const void *value)
   error_t err;
   struct __pthread *self = _pthread_self ();
 
+  if (key < 0 || key >= __pthread_key_count
+      || __pthread_key_destructors[key] == PTHREAD_KEY_INVALID)
+    return EINVAL;
+
   if (! self->thread_specifics)
     {
       err = hurd_ihash_create (&self->thread_specifics, HURD_IHASH_NO_LOCP);