tdb2: new tests, and new fixes.
[ccan] / ccan / tdb2 / check.c
index f005a48de317ee80890e7b0d187948c49e8c46be..42f7538edf97a899d9a3758b78c3ec59bf1c2dfb 100644 (file)
@@ -71,8 +71,8 @@ static bool check_header(struct tdb_context *tdb)
            < tdb->map_size) {
                tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
                         "check: %llu zones size %llu don't cover %llu\n",
-                        (long long)(1ULL << tdb->header.v.zone_bits),
                         (long long)tdb->header.v.num_zones,
+                        (long long)(1ULL << tdb->header.v.zone_bits),
                         (long long)tdb->map_size);
                return false;
        }
@@ -86,8 +86,8 @@ static bool check_header(struct tdb_context *tdb)
 static int off_cmp(const tdb_off_t *a, const tdb_off_t *b)
 {
        /* Can overflow an int. */
-       return a > b ? 1
-               : a < b ? -1
+       return *a > *b ? 1
+               : *a < *b ? -1
                : 0;
 }
 
@@ -187,7 +187,8 @@ static bool check_hash_list(struct tdb_context *tdb,
                num_nonzero++;
        }
 
-       if (num_found != num_used) {
+       /* free table and hash table are two of the used blocks. */
+       if (num_found != num_used - 2) {
                tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
                         "tdb_check: Not all entries are in hash\n");
                return false;
@@ -322,11 +323,10 @@ int tdb_check(struct tdb_context *tdb,
        size_t num_free = 0, num_used = 0;
        bool hash_found = false, free_found = false;
 
+       /* This always ensures the header is uptodate. */
        if (tdb_allrecord_lock(tdb, F_RDLCK, TDB_LOCK_WAIT, false) != 0)
                return -1;
 
-       update_header(tdb);
-
        if (!check_header(tdb))
                goto fail;
 
@@ -372,6 +372,14 @@ int tdb_check(struct tdb_context *tdb,
                        if (tdb->methods->oob(tdb, off + len, false))
                                goto fail;
 
+                       if (len < sizeof(p->f)) {
+                               tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
+                                        "tdb_check: too short record %llu at"
+                                        " %llu\n",
+                                        (long long)len, (long long)off);
+                               goto fail;
+                       }
+
                        if (off + sizeof(p->u) == tdb->header.v.hash_off) {
                                hash_found = true;
                        } else if (off + sizeof(p->u)
@@ -403,9 +411,9 @@ int tdb_check(struct tdb_context *tdb,
                goto fail;
 
        tdb_allrecord_unlock(tdb, F_RDLCK);
-       return true;
+       return 0;
 
 fail:
        tdb_allrecord_unlock(tdb, F_RDLCK);
-       return false;
+       return -1;
 }