tdb: Make get_hash_length circular-safe

[sfrench/samba-autobuild/.git] / lib / tdb / common / summary.c

diff --git a/lib/tdb/common/summary.c b/lib/tdb/common/summary.c
index c9b5bc4c1d0b490b9948bde4ad6c93e9fc13aa04..a93eb93e734123041b0aafb7bc22ddb89e61866e 100644 (file)
--- a/lib/tdb/common/summary.c
+++ b/lib/tdb/common/summary.c
@@ -72,18 +72,26 @@ static size_t tally_mean(const struct tally *tally)
 static size_t get_hash_length(struct tdb_context *tdb, unsigned int i)
 {
        tdb_off_t rec_ptr;
+       struct tdb_chainwalk_ctx chainwalk;
        size_t count = 0;
 
        if (tdb_ofs_read(tdb, TDB_HASH_TOP(i), &rec_ptr) == -1)
                return 0;
 
+       tdb_chainwalk_init(&chainwalk, rec_ptr);
+
        /* keep looking until we find the right record */
        while (rec_ptr) {
                struct tdb_record r;
+               bool ok;
                ++count;
                if (tdb_rec_read(tdb, rec_ptr, &r) == -1)
                        return 0;
                rec_ptr = r.next;
+               ok = tdb_chainwalk_check(tdb, &chainwalk, rec_ptr);
+               if (!ok) {
+                       return SIZE_MAX;
+               }
        }
        return count;
 }