From 1d62a403734b18367eb0aa47493d0de644edd00b Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 13 Jan 2020 19:41:57 +0100 Subject: [PATCH] htl: Avoid crashing when passed invalid pthread_t values --- htl/pt-internal.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htl/pt-internal.h b/htl/pt-internal.h index 8754f38..f8d7d74 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -173,12 +173,14 @@ extern int __pthread_concurrency; brain-dead users of the pthread interface incorrectly assume that 0 is an invalid pthread id.) */ extern struct __pthread **__pthread_threads; +extern int __pthread_max_threads; extern pthread_rwlock_t __pthread_threads_lock; #define __pthread_getid(thread) \ - ({ struct __pthread *__t; \ + ({ struct __pthread *__t = NULL; \ __pthread_rwlock_rdlock (&__pthread_threads_lock); \ - __t = __pthread_threads[thread - 1]; \ + if (thread <= __pthread_max_threads) \ + __t = __pthread_threads[thread - 1]; \ __pthread_rwlock_unlock (&__pthread_threads_lock); \ __t; }) -- 2.7.4