ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wine_dlsym instead of dlsym to avoid the glibc dlerror bug. 

Call dlsym with RTLD_DEFAULT for symbols that we don't redefine to
work around another glibc bug.
This commit is contained in:
Alexandre Julliard 2004-06-24 04:07:22 +00:00
parent 55efefddee
commit 9bfe0c4ec4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
loader/kthread.c
View File

@ -146,7 +146,7 @@ struct __res_state *__res_state(void)
static inline void writejump( const char *symbol, void *dest ) static inline void writejump( const char *symbol, void *dest )
{ {
#if defined(__GLIBC__) && defined(__i386__) #if defined(__GLIBC__) && defined(__i386__)
unsigned char *addr = dlsym( RTLD_NEXT, symbol ); unsigned char *addr = wine_dlsym( RTLD_NEXT, symbol, NULL, 0 );
if (!addr) return; if (!addr) return;
@ -562,7 +562,7 @@ pid_t __fork(void)
if (!libc_fork) if (!libc_fork)
{ {
libc_fork = dlsym( RTLD_NEXT, "fork" ); libc_fork = wine_dlsym( RTLD_NEXT, "fork", NULL, 0 );
assert( libc_fork ); assert( libc_fork );
} }
pthread_mutex_lock( &atfork_mutex ); pthread_mutex_lock( &atfork_mutex );
@ -926,7 +926,7 @@ int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact)
{ {
if (!libc_sigaction) if (!libc_sigaction)
{ {
libc_sigaction = dlsym( RTLD_NEXT, "sigaction" ); libc_sigaction = wine_dlsym( RTLD_NEXT, "sigaction", NULL, 0 );
assert( libc_sigaction ); assert( libc_sigaction );
} }
return libc_sigaction(signum, act, oldact); return libc_sigaction(signum, act, oldact);
@ -939,10 +939,10 @@ void __pthread_initialize(void)
if (!done) if (!done)
{ {
done = 1; done = 1;
libc_fork = dlsym( RTLD_NEXT, "fork" ); libc_fork = wine_dlsym( RTLD_NEXT, "fork", NULL, 0 );
libc_sigaction = dlsym( RTLD_NEXT, "sigaction" ); libc_sigaction = wine_dlsym( RTLD_NEXT, "sigaction", NULL, 0 );
libc_uselocale = dlsym( RTLD_NEXT, "uselocale" ); libc_uselocale = wine_dlsym( RTLD_DEFAULT, "uselocale", NULL, 0 );
libc_pthread_init = dlsym( RTLD_NEXT, "__libc_pthread_init" ); libc_pthread_init = wine_dlsym( RTLD_NEXT, "__libc_pthread_init", NULL, 0 );
if (libc_pthread_init) libc_multiple_threads = libc_pthread_init( &libc_pthread_functions ); if (libc_pthread_init) libc_multiple_threads = libc_pthread_init( &libc_pthread_functions );
} }
} }