summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2021-01-28 11:35:18 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-02-01 06:22:20 +0100
commit450c170536391f094bbd501afae0cce05072a87d (patch)
tree7308e96704efd1915c96efe9827c194fd9423e36
parentscore: Fix _CORE_message_queue_Submit() indentation (diff)
downloadrtems-450c170536391f094bbd501afae0cce05072a87d.tar.bz2
score: Add comments and asserts for clarification
This fix relates to a Coverity issue (NULL_RETURNS).
-rw-r--r--cpukit/include/rtems/score/priorityimpl.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/cpukit/include/rtems/score/priorityimpl.h b/cpukit/include/rtems/score/priorityimpl.h
index 1a7f90a065..7a14ec97b8 100644
--- a/cpukit/include/rtems/score/priorityimpl.h
+++ b/cpukit/include/rtems/score/priorityimpl.h
@@ -613,7 +613,9 @@ RTEMS_INLINE_ROUTINE void _Priority_Extract(
} else {
Priority_Node *min;
+ /* The aggregation is non-empty, so the minimum node exists. */
min = _Priority_Get_minimum_node( aggregation );
+ _Assert( min != NULL );
if ( node->priority < min->priority ) {
aggregation->Node.priority = min->priority;
@@ -684,7 +686,12 @@ RTEMS_INLINE_ROUTINE void _Priority_Changed(
_Priority_Plain_changed( aggregation, node );
+ /*
+ * There is at least the changed node in the aggregation, so the minimum node
+ * exists.
+ */
min = _Priority_Get_minimum_node( aggregation );
+ _Assert( min != NULL );
if ( min->priority != aggregation->Node.priority ) {
aggregation->Node.priority = min->priority;