summaryrefslogtreecommitdiff
path: root/libpthread/sysdeps/hurd/pt-getspecific.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-11-06 13:25:27 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-11-06 13:25:27 +0100
commit8f34bd6d8695f68dfaeeb7a72c812db67aa90bbf (patch)
treef5293c830540b1444a68ad4c86ef172ba4c187bc /libpthread/sysdeps/hurd/pt-getspecific.c
parent873332500bcc7a705566d0338b117d3df86aac05 (diff)
parente4de8df465f6c984fc1ac337167499cca7700f63 (diff)
Merge branch 'libpthread-moved' into upstream-merged
Diffstat (limited to 'libpthread/sysdeps/hurd/pt-getspecific.c')
-rw-r--r--libpthread/sysdeps/hurd/pt-getspecific.c4
1 files changed, 3 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)