RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Fixed infinite recursion bug in PTHREAD_MUTEX_INITIALIZER.

Browse Source
This commit is contained in:
Joel Sherrill
1997-08-22 19:11:02 +00:00
parent 799a5b9f8d
commit 9b1f5678c2
2 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
c/src/exec/posix/src/mutex.c
View File

@@ -230,17 +230,22 @@ int pthread_mutex_init(
if ( !mutex ) if ( !mutex )
return EINVAL; return EINVAL;
/* EBUSY if *mutex is a valid id */ /* avoid infinite recursion on call to this routine in _POSIX_Mutex_Get */
mutex_in_use = _POSIX_Mutex_Get( mutex, &location ); if ( *mutex != PTHREAD_MUTEX_INITIALIZER ) {
switch ( location ) {
case OBJECTS_ERROR: /* EBUSY if *mutex is a valid id */
break;
case OBJECTS_REMOTE: mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
case OBJECTS_LOCAL: switch ( location ) {
_Thread_Enable_dispatch(); case OBJECTS_ERROR:
return EBUSY; break;
}; case OBJECTS_REMOTE:
case OBJECTS_LOCAL:
_Thread_Enable_dispatch();
return EBUSY;
}
}
if ( !the_attr->is_initialized ) if ( !the_attr->is_initialized )
return EINVAL; return EINVAL;

25
cpukit/posix/src/mutex.c
View File

@@ -230,17 +230,22 @@ int pthread_mutex_init(
if ( !mutex ) if ( !mutex )
return EINVAL; return EINVAL;
/* EBUSY if *mutex is a valid id */ /* avoid infinite recursion on call to this routine in _POSIX_Mutex_Get */
mutex_in_use = _POSIX_Mutex_Get( mutex, &location ); if ( *mutex != PTHREAD_MUTEX_INITIALIZER ) {
switch ( location ) {
case OBJECTS_ERROR: /* EBUSY if *mutex is a valid id */
break;
case OBJECTS_REMOTE: mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
case OBJECTS_LOCAL: switch ( location ) {
_Thread_Enable_dispatch(); case OBJECTS_ERROR:
return EBUSY; break;
}; case OBJECTS_REMOTE:
case OBJECTS_LOCAL:
_Thread_Enable_dispatch();
return EBUSY;
}
}
if ( !the_attr->is_initialized ) if ( !the_attr->is_initialized )
return EINVAL; return EINVAL;