From 2bbbfad1bcc689228c5dcc3fc40ec84dd81b0772 Mon Sep 17 00:00:00 2001 From: Mattia Basaglia Date: Tue, 21 Jul 2015 16:26:18 +0200 Subject: [PATCH] Fix a horrible bug in q3map2 This function passed a int* instead of a void** causing local variables to be overwritten, which in turn caused the program to crash. --- tools/quake3/common/threads.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.c index 4d44bf36..04946dd2 100644 --- a/tools/quake3/common/threads.c +++ b/tools/quake3/common/threads.c @@ -538,7 +538,7 @@ void RunThreadsOn( int workcnt, qboolean showpacifier, void ( *func )( int ) ){ size_t stacksize; int start, end; - int i = 0, status = 0; + int i = 0; start = I_FloatTime(); pacifier = showpacifier; @@ -582,7 +582,7 @@ void RunThreadsOn( int workcnt, qboolean showpacifier, void ( *func )( int ) ){ } for ( i = 0 ; i < numthreads ; i++ ) { - if ( pthread_join( work_threads[i], (void **)&status ) != 0 ) { + if ( pthread_join( work_threads[i], NULL ) != 0 ) { Error( "pthread_join failed" ); } } -- 2.39.2