summaryrefslogtreecommitdiffstats
path: root/cpukit/score/src
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2014-07-22 14:50:07 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2014-07-26 12:01:25 +0200
commit639117fd12781fcb92919e2095fc345f9caa4180 (patch)
treeb1f3b57bf912603a2e5a9aa0f0858914094f1be3 /cpukit/score/src
parenttodimpl.h: Add missing Doxygen (diff)
downloadrtems-639117fd12781fcb92919e2095fc345f9caa4180.tar.bz2
rbtree: Update maximum node in LIFO order
The test sptests/sp35 showed a NULL pointer access due to an invalid maximum node field (e.g. a tree with one element and NULL as the maximum node).
Diffstat (limited to 'cpukit/score/src')
-rw-r--r--cpukit/score/src/rbtreeinsert.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpukit/score/src/rbtreeinsert.c b/cpukit/score/src/rbtreeinsert.c
index b31c8e7bb7..afff1ef5f9 100644
--- a/cpukit/score/src/rbtreeinsert.c
+++ b/cpukit/score/src/rbtreeinsert.c
@@ -96,8 +96,8 @@ RBTree_Node *_RBTree_Insert(
);
if (
- ( !dir && _RBTree_Is_lesser( compare_result ) )
- || ( dir && _RBTree_Is_greater( compare_result ) )
+ ( dir == RBT_LEFT && _RBTree_Is_lesser( compare_result ) )
+ || ( dir == RBT_RIGHT && !_RBTree_Is_lesser( compare_result ) )
) {
the_rbtree->first[ dir ] = the_node;
}