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

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

@@ -230,6 +230,10 @@ int pthread_mutex_init(
if ( !mutex ) if ( !mutex )
return EINVAL; return EINVAL;
/* avoid infinite recursion on call to this routine in _POSIX_Mutex_Get */
if ( *mutex != PTHREAD_MUTEX_INITIALIZER ) {
/* EBUSY if *mutex is a valid id */ /* EBUSY if *mutex is a valid id */
mutex_in_use = _POSIX_Mutex_Get( mutex, &location ); mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
@@ -240,7 +244,8 @@ int pthread_mutex_init(
case OBJECTS_LOCAL: case OBJECTS_LOCAL:
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
return EBUSY; return EBUSY;
}; }
}
if ( !the_attr->is_initialized ) if ( !the_attr->is_initialized )
return EINVAL; return EINVAL;

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

@@ -230,6 +230,10 @@ int pthread_mutex_init(
if ( !mutex ) if ( !mutex )
return EINVAL; return EINVAL;
/* avoid infinite recursion on call to this routine in _POSIX_Mutex_Get */
if ( *mutex != PTHREAD_MUTEX_INITIALIZER ) {
/* EBUSY if *mutex is a valid id */ /* EBUSY if *mutex is a valid id */
mutex_in_use = _POSIX_Mutex_Get( mutex, &location ); mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
@@ -240,7 +244,8 @@ int pthread_mutex_init(
case OBJECTS_LOCAL: case OBJECTS_LOCAL:
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
return EBUSY; return EBUSY;
}; }
}
if ( !the_attr->is_initialized ) if ( !the_attr->is_initialized )
return EINVAL; return EINVAL;