walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Avoid malloc poisoning issue when including <pthread.h> of uclibc (#1013)

This commit is contained in:
Even Rouault 2017-09-07 17:52:59 +02:00
parent cc893a4ebf
commit 51a1dcaa6e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/openjp2/thread.c
View File

@ -29,9 +29,6 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "opj_includes.h"
#include "thread.h"
#include <assert.h> #include <assert.h>
#ifdef MUTEX_win32 #ifdef MUTEX_win32
@ -46,6 +43,8 @@
#include <windows.h> #include <windows.h>
#include <process.h> #include <process.h>
#include "opj_includes.h"
OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
{ {
return OPJ_TRUE; return OPJ_TRUE;
@ -289,6 +288,10 @@ void opj_thread_join(opj_thread_t* thread)
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
/* Moved after all system includes, and in particular pthread.h, so as to */
/* avoid poisoning issuing with malloc() use in pthread.h with ulibc (#1013) */
#include "opj_includes.h"
OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
{ {
return OPJ_TRUE; return OPJ_TRUE;
@ -425,6 +428,8 @@ void opj_thread_join(opj_thread_t* thread)
#else #else
/* Stub implementation */ /* Stub implementation */
#include "opj_includes.h"
OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void) OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
{ {
return OPJ_FALSE; return OPJ_FALSE;