generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work around a bug in Immersion's libImmEmulatorJ.so.

Browse Source 
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL
pthread_mutex_t*. This gives them (and their users) one release to fix things.

Bug: 17443936

(cherry picked from commit 7d3f553f98)

Change-Id: Ie26bbecd3a74d61113b51c18832872499b97ee86
This commit is contained in:
Elliott Hughes
2014-10-07 16:02:11 -07:00
parent ea8dea8cb7
commit b5e7eba6d1
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libc/bionic/pthread_mutex.cpp
View File

@@ -440,6 +440,12 @@ static inline __always_inline int _recursive_increment(pthread_mutex_t* mutex, i
}
int pthread_mutex_lock(pthread_mutex_t* mutex) {
#if !defined(__LP64__)
if (mutex == NULL) {
return EINVAL;
}
#endif
int mvalue, mtype, tid, shared;
mvalue = mutex->value;
@@ -516,6 +522,12 @@ int pthread_mutex_lock(pthread_mutex_t* mutex) {
}
int pthread_mutex_unlock(pthread_mutex_t* mutex) {
#if !defined(__LP64__)
if (mutex == NULL) {
return EINVAL;
}
#endif
int mvalue, mtype, tid, shared;
mvalue = mutex->value;

4
libc/include/pthread.h
View File

@@ -206,10 +206,10 @@ int pthread_mutexattr_settype(pthread_mutexattr_t*, int) __nonnull((1));
int pthread_mutex_destroy(pthread_mutex_t*) __nonnull((1));
int pthread_mutex_init(pthread_mutex_t*, const pthread_mutexattr_t*) __nonnull((1));
int pthread_mutex_lock(pthread_mutex_t*) __nonnull((1));
int pthread_mutex_lock(pthread_mutex_t*) /* __nonnull((1)) */;
int pthread_mutex_timedlock(pthread_mutex_t*, const struct timespec*) __nonnull((1, 2));
int pthread_mutex_trylock(pthread_mutex_t*) __nonnull((1));
int pthread_mutex_unlock(pthread_mutex_t*) __nonnull((1));
int pthread_mutex_unlock(pthread_mutex_t*) /* __nonnull((1)) */;
int pthread_once(pthread_once_t*, void (*)(void)) __nonnull((1, 2));