Changeset 8b3bff5 in mainline

Timestamp:

2010-11-21T16:07:22Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1fe9bf6, 2ecc9d4, cc70d57, dc0b964

Parents:

7e1f9b7

Message:

btree_search() can find an already removed key if the tree is empty.

File:

• kernel/generic/src/adt/btree.c (modified) (2 diffs)

kernel/generic/src/adt/btree.c

@@ -888 +888 @@
                 *leaf_node = cur;
                 
+                if (cur->keys == 0)
+                        return NULL;
+
                 /*
                  * The key can be in the leftmost subtree.
@@ -926 +929 @@
                                 return key == cur->key[i - 1] ? val : NULL;
                 }
-                descend:
+descend:
                 ;
         }