Fixes

Author: ldorau

src/critnib/critnib.c

@@ -385,9 +385,9 @@ int critnib_insert(struct critnib *c, word key, void *value, int update) {
     word at = path ^ key;
     if (!at) {
         ASSERT(is_leaf(n));
-        if (to_leaf(kn)->value == value) {
+        if (to_leaf(kn)->to_be_freed == value) {
             // do not free the value
-            to_leaf(kn)->value = NULL;
+            to_leaf(kn)->to_be_freed = NULL;
         }
         free_leaf(c, to_leaf(kn));
 
@@ -453,7 +453,7 @@ void *critnib_remove(struct critnib *c, word key, void **ref) {
     do {
         del = (utils_atomic_increment_u64(&c->remove_count) - 1) % DELETED_LIFE;
         k = c->pending_del_leaves[del];
-        if (i_del++ > DELETED_LIFE) {
+        if (i_del++ == DELETED_LIFE) {
             break;
         }
     } while (k && (k->ref_count > 0));
@@ -539,7 +539,8 @@ int critnib_release(struct critnib *c, void *ref) {
     struct critnib_leaf *k = (struct critnib_leaf *)ref;
 
     /* decrement the reference count */
-    if (utils_atomic_decrement_u64(&k->ref_count) == 0) {
+    if (k->key && k->to_be_freed && k->ref_count &&
+        (utils_atomic_decrement_u64(&k->ref_count) == 0)) {
         void *value = k->to_be_freed;
         utils_atomic_store_release_ptr(&k->to_be_freed, NULL);
         utils_atomic_store_release_u64(&k->key, 0);
@@ -597,7 +598,7 @@ void *critnib_get(struct critnib *c, word key, void **ref) {
         if (ref_count == 0) {
             return NULL;
         }
-        if ((ref_count = utils_atomic_increment_u64(&k->ref_count)) == 1) {
+        if (utils_atomic_increment_u64(&k->ref_count) == 1) {
             utils_atomic_decrement_u64(&k->ref_count);
             return NULL;
         }
@@ -740,7 +741,7 @@ void *critnib_find_le(struct critnib *c, word key, void **ref) {
         if (ref_count == 0) {
             return NULL;
         }
-        if ((ref_count = utils_atomic_increment_u64(&k->ref_count)) == 1) {
+        if (utils_atomic_increment_u64(&k->ref_count) == 1) {
             utils_atomic_decrement_u64(&k->ref_count);
             return NULL;
         }
@@ -889,7 +890,7 @@ int critnib_find(struct critnib *c, uintptr_t key, enum find_dir_t dir,
         if (ref_count == 0) {
             return 0;
         }
-        if ((ref_count = utils_atomic_increment_u64(&k->ref_count)) == 1) {
+        if (utils_atomic_increment_u64(&k->ref_count) == 1) {
             utils_atomic_decrement_u64(&k->ref_count);
             return 0;
         }