github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-04-12 04:12:05 +02:00
Code Releases Activity

Revert "fix Linux threads to actually use allocated memory"

Browse Source 
This reverts commit f95152dfc16da32e5b59abdee60ddab209c2a564.
This commit is contained in:
Brent Cook 2016-04-26 16:49:46 -04:00
parent 328bd0a93d
commit 84140c23ba
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
2 changed files with 95 additions and 94 deletions
c/meterpreter/source/common
thread.cthread.h

11
c/meterpreter/source/common/thread.c

@ -23,14 +23,15 @@ int __futex_wake(volatile void *ftx, int count);
*/ */
LOCK * lock_create( VOID ) LOCK * lock_create( VOID )
{ {
LOCK * lock = calloc(1, sizeof(LOCK)); LOCK * lock = (LOCK *)malloc( sizeof( LOCK ) );
if( lock != NULL ) if( lock != NULL )
{ {
memset( lock, 0, sizeof( LOCK ) );
#ifdef _WIN32 #ifdef _WIN32
lock->handle = CreateMutex( NULL, FALSE, NULL ); lock->handle = CreateMutex( NULL, FALSE, NULL );
#else #else
pthread_mutex_init(&lock->handle, NULL); pthread_mutex_init(lock->handle, NULL);
#endif #endif
} }
return lock; return lock;
@ -48,7 +49,7 @@ VOID lock_destroy(LOCK * lock)
#ifdef _WIN32 #ifdef _WIN32
CloseHandle( lock->handle ); CloseHandle( lock->handle );
#else #else
pthread_mutex_destroy(&lock->handle); pthread_mutex_destroy(lock->handle);
#endif #endif
free( lock ); free( lock );
@ -64,7 +65,7 @@ VOID lock_acquire(LOCK * lock)
#ifdef _WIN32 #ifdef _WIN32
WaitForSingleObject( lock->handle, INFINITE ); WaitForSingleObject( lock->handle, INFINITE );
#else #else
pthread_mutex_lock(&lock->handle); pthread_mutex_lock(lock->handle);
#endif #endif
} }
} }
@ -78,7 +79,7 @@ VOID lock_release(LOCK * lock)
#ifdef _WIN32 #ifdef _WIN32
ReleaseMutex( lock->handle ); ReleaseMutex( lock->handle );
#else #else
pthread_mutex_unlock(&lock->handle); pthread_mutex_unlock(lock->handle);
#endif #endif
} }
} }

2
c/meterpreter/source/common/thread.h

@ -44,7 +44,7 @@ typedef struct _LOCK
#ifdef _WIN32 #ifdef _WIN32
HANDLE handle; HANDLE handle;
#else #else
pthread_mutex_t handle; pthread_mutex_t *handle;
#endif // _WIN32 #endif // _WIN32
} LOCK, * LPLOCK; } LOCK, * LPLOCK;