r5533: Patch to detect infinite loops when traversing a tdb from "Shlomi Yaakobovich...

Jeremy.
(This used to be commit 84f6d2b3dd29c1aa478708db9617a79382158f64)

diff --git a/source4/lib/tdb/common/tdb.c b/source4/lib/tdb/common/tdb.c
index 134ee8a4ead59813f9542132dacf5640d324f117..90b586d487b8e2563dec8c9b7b54d2985f6933af 100644 (file)
--- a/source4/lib/tdb/common/tdb.c
+++ b/source4/lib/tdb/common/tdb.c
@@ -1314,6 +1314,13 @@ static int tdb_next_lock(TDB_CONTEXT *tdb, struct tdb_traverse_lock *tlock,
                                        goto fail;
                                return tlock->off;
                        }
+
+                       /* Detect infinite loops. From "Shlomi Yaakobovich" <Shlomi@exanet.com>. */
+                       if (tlock->off == rec->next) {
+                               TDB_LOG((tdb, 0, "tdb_next_lock: loop detected.\n"));
+                               goto fail;
+                       }
+
                        /* Try to clean dead ones from old traverses */
                        current = tlock->off;
                        tlock->off = rec->next;