system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-23 02:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix an off-by-one error in the recursive mutex handling that made it

Browse source 
prematurely release recursive mutexes.

Test case provided by: Bradley T. Hughes <bhughes@trolltech.com>
Reviewed by: deischen
This commit is contained in:
Alfred Perlstein 2000-08-13 01:30:36 +00:00
parent 74e6090127
commit 022daa34f2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=64574
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libc_r/uthread/uthread_mutex.c
View file

@ -753,7 +753,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {
@ -821,7 +821,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {
@ -939,7 +939,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {

6
lib/libkse/thread/thr_mutex.c
View file

@ -753,7 +753,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {
@ -821,7 +821,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {
@ -939,7 +939,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {

6
lib/libpthread/thread/thr_mutex.c
View file

@ -753,7 +753,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {
@ -821,7 +821,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {
@ -939,7 +939,7 @@ mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
}
else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
((*mutex)->m_data.m_count > 1)) {
((*mutex)->m_data.m_count > 0)) {
/* Decrement the count: */
(*mutex)->m_data.m_count--;
} else {