3 files changed, 10 insertions, 1 deletions
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-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);
diff --git a/libpthread/tests/test-7.c b/libpthread/tests/test-7.c
index 8159be34..22fb1caa 100644
--- a/libpthread/tests/test-7.c
+++ b/libpthread/tests/test-7.c
@@ -42,6 +42,9 @@ main (int argc, char **argv)
       assert ((pthread_t) val == pthread_self ());
     }
 
+  assert (pthread_getspecific ((pthread_key_t) 0) == NULL);
+  assert (pthread_setspecific ((pthread_key_t) 0, (void *) 0x1) == EINVAL);
+
   for (i = 0; i < KEYS; i ++)
     err = pthread_key_create (&key[i], des);