Skip to content

bpo-33015: Add a wrapper for thread function in PyThread_start_new_thread #6008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 4 commits into from
Nov 30, 2018
Merged

bpo-33015: Add a wrapper for thread function in PyThread_start_new_thread #6008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3a9724
Add a wrapper for thread function in PyThread_start_new_thread
siddhesh Oct 25, 2018
4d5b9b0
Cleanup code
vstinner Nov 30, 2018
6d0bade
More cleanup
vstinner Nov 30, 2018
1499f46
fix typo in the NEWS entry
vstinner Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Build/2018-08-24-09-48-25.bpo-33015.s21y74.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix an undefined behaviour in the pthread implementation of
:c:func:`PyThread_start_new_thread`: add a function wrapper to always return
``NULL``.
40 changes: 36 additions & 4 deletions Python/thread_pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,28 @@ PyThread__init_thread(void)
* Thread support.
*/

/* bpo-33015: pythread_callback struct and pythread_wrapper() cast
"void func(void *)" to "void* func(void *)": always return NULL.

PyThread_start_new_thread() uses "void func(void *)" type, whereas
pthread_create() requires a void* return value. */
typedef struct {
Comment thread
siddhesh marked this conversation as resolved.
Outdated
void (*func) (void *);
void *arg;
} pythread_callback;

static void *
pythread_wrapper(void *arg)
{
/* copy func and func_arg and free the temporary structure */
pythread_callback *callback = arg;
void (*func)(void *) = callback->func;
void *func_arg = callback->arg;
PyMem_RawFree(arg);

func(func_arg);
return NULL;
}

unsigned long
PyThread_start_new_thread(void (*func)(void *), void *arg)
Expand Down Expand Up @@ -188,21 +210,31 @@ PyThread_start_new_thread(void (*func)(void *), void *arg)
pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
#endif

pythread_callback *callback = PyMem_RawMalloc(sizeof(pythread_callback));

if (callback == NULL) {
return PYTHREAD_INVALID_THREAD_ID;
Comment thread
vstinner marked this conversation as resolved.
Outdated
}

callback->func = func;
callback->arg = arg;

status = pthread_create(&th,
#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
&attrs,
#else
(pthread_attr_t*)NULL,
#endif
(void* (*)(void *))func,
(void *)arg
);
pythread_wrapper, callback);

#if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
pthread_attr_destroy(&attrs);
#endif
if (status != 0)

if (status != 0) {
PyMem_RawFree(callback);
return PYTHREAD_INVALID_THREAD_ID;
}

pthread_detach(th);

Expand Down