mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
nptl: Handle NULL abstime [BZ #26394]
Since abstime passed to pthread_{clock|timed}join_np may be NULL, convert to 64 bit abstime only if abstime isn't NULL.
This commit is contained in:
@ -34,9 +34,13 @@ int
|
||||
__pthread_timedjoin_np (pthread_t threadid, void **thread_return,
|
||||
const struct timespec *abstime)
|
||||
{
|
||||
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
|
||||
|
||||
return __pthread_timedjoin_np64 (threadid, thread_return, &ts64);
|
||||
if (abstime != NULL)
|
||||
{
|
||||
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
|
||||
return __pthread_timedjoin_np64 (threadid, thread_return, &ts64);
|
||||
}
|
||||
else
|
||||
return __pthread_timedjoin_np64 (threadid, thread_return, NULL);
|
||||
}
|
||||
#endif
|
||||
weak_alias (__pthread_timedjoin_np, pthread_timedjoin_np)
|
||||
|
Reference in New Issue
Block a user