am 9297af94
: Merge "Fix a potential NULL pointer dereference in _init_thread()."
* commit '9297af943887d9d6974aaec8c45a4e7d93422965': Fix a potential NULL pointer dereference in _init_thread().
This commit is contained in:
commit
0b8fa1d456
@ -211,16 +211,12 @@ void __thread_entry(int (*func)(void*), void *arg, void **tls)
|
||||
#include <private/logd.h>
|
||||
|
||||
__LIBC_ABI_PRIVATE__
|
||||
int _init_thread(pthread_internal_t* thread, pid_t kernel_id, pthread_attr_t* attr,
|
||||
int _init_thread(pthread_internal_t* thread, pid_t kernel_id, const pthread_attr_t* attr,
|
||||
void* stack_base, bool add_to_thread_list)
|
||||
{
|
||||
int error = 0;
|
||||
|
||||
if (attr == NULL) {
|
||||
thread->attr = gDefaultPthreadAttr;
|
||||
} else {
|
||||
thread->attr = *attr;
|
||||
}
|
||||
thread->attr.stack_base = stack_base;
|
||||
thread->kernel_id = kernel_id;
|
||||
|
||||
@ -234,7 +230,8 @@ int _init_thread(pthread_internal_t* thread, pid_t kernel_id, pthread_attr_t* at
|
||||
struct sched_param param;
|
||||
param.sched_priority = thread->attr.sched_priority;
|
||||
if (sched_setscheduler(kernel_id, thread->attr.sched_policy, ¶m) == -1) {
|
||||
// For back compat reasons, we just warn about possible invalid sched_policy
|
||||
// For backwards compatibility reasons, we just warn about failures here.
|
||||
// error = errno;
|
||||
const char* msg = "pthread_create sched_setscheduler call failed: %s\n";
|
||||
__libc_android_log_print(ANDROID_LOG_WARN, "libc", msg, strerror(errno));
|
||||
}
|
||||
@ -361,7 +358,7 @@ int pthread_create(pthread_t *thread_out, pthread_attr_t const * attr,
|
||||
return clone_errno;
|
||||
}
|
||||
|
||||
int init_errno = _init_thread(thread, tid, (pthread_attr_t*) attr, stack, true);
|
||||
int init_errno = _init_thread(thread, tid, attr, stack, true);
|
||||
if (init_errno != 0) {
|
||||
// Mark the thread detached and let its __thread_entry run to
|
||||
// completion. (It'll just exit immediately, cleaning up its resources.)
|
||||
|
@ -54,7 +54,7 @@ typedef struct pthread_internal_t
|
||||
char dlerror_buffer[__BIONIC_DLERROR_BUFFER_SIZE];
|
||||
} pthread_internal_t;
|
||||
|
||||
int _init_thread(pthread_internal_t* thread, pid_t kernel_id, pthread_attr_t* attr,
|
||||
int _init_thread(pthread_internal_t* thread, pid_t kernel_id, const pthread_attr_t* attr,
|
||||
void* stack_base, bool add_to_thread_list);
|
||||
void _pthread_internal_add( pthread_internal_t* thread );
|
||||
pthread_internal_t* __get_thread(void);
|
||||
|
Loading…
Reference in New Issue
Block a user