AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Handle NULL abstime [BZ #26394]

Browse Source 
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:
H.J. Lu 2020-08-15 11:06:35 -07:00
parent 23a7896d06
commit cb7e7a5ca1
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nptl/pthread_clockjoin.c
View File

@ -34,9 +34,15 @@ int
__pthread_clockjoin_np (pthread_t threadid, void **thread_return, __pthread_clockjoin_np (pthread_t threadid, void **thread_return,
clockid_t clockid, const struct timespec *abstime) clockid_t clockid, const struct timespec *abstime)
{ {
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime); if (abstime != NULL)
{
return __pthread_clockjoin_np64 (threadid, thread_return, clockid, &ts64); struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime);
return __pthread_clockjoin_np64 (threadid, thread_return, clockid,
&ts64);
}
else
return __pthread_clockjoin_np64 (threadid, thread_return, clockid,
NULL);
} }
#endif #endif
weak_alias (__pthread_clockjoin_np, pthread_clockjoin_np) weak_alias (__pthread_clockjoin_np, pthread_clockjoin_np)

10
nptl/pthread_timedjoin.c
View File

@ -34,9 +34,13 @@ int
__pthread_timedjoin_np (pthread_t threadid, void **thread_return, __pthread_timedjoin_np (pthread_t threadid, void **thread_return,
const struct timespec *abstime) const struct timespec *abstime)
{ {
struct __timespec64 ts64 = valid_timespec_to_timespec64 (*abstime); if (abstime != NULL)
{
return __pthread_timedjoin_np64 (threadid, thread_return, &ts64); 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 #endif
weak_alias (__pthread_timedjoin_np, pthread_timedjoin_np) weak_alias (__pthread_timedjoin_np, pthread_timedjoin_np)