From: Sebastian Huber <sebastian.hu...@embedded-brains.de>
Use _Workspace_Allocate_or_fatal_error() consistently in case auto
extend is turned off. This helps to avoid undefined behaviour in
_API_Mutex_Allocate() in case _API_Mutex_Information() fails.
---
cpukit/score/src/objectextendinformation.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/cpukit/score/src/objectextendinformation.c
b/cpukit/score/src/objectextendinformation.c
index c56a831..d94d5cd 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -142,11 +142,14 @@ void _Objects_Extend_information(
block_size = block_count *
(sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
((maximum + minimum_index) * sizeof(Objects_Control *));
- object_blocks = (void**) _Workspace_Allocate( block_size );
-
- if ( !object_blocks ) {
- _Workspace_Free( new_object_block );
- return;
+ if ( information->auto_extend ) {
+ object_blocks = _Workspace_Allocate( block_size );
+ if ( !object_blocks ) {
+ _Workspace_Free( new_object_block );
+ return;
+ }
+ } else {
+ object_blocks = _Workspace_Allocate_or_fatal_error( block_size );
}
/*
--
2.7.4
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
