dbwrap: don't steal off talloc_stackframe().
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 29 Jun 2012 06:39:02 +0000 (16:09 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 29 Jun 2012 06:39:02 +0000 (16:09 +0930)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
lib/dbwrap/dbwrap.c

index 4c0160a4740cfe931674d6f49879f3d59e2b9c61..33b20718dca809017c5f6bd2fe50b75f127f9b6d 100644 (file)
@@ -195,21 +195,18 @@ static struct db_record *dbwrap_fetch_locked_internal(
 {
        struct db_record *rec;
        struct dbwrap_lock_order_state *lock_order;
-       TALLOC_CTX *frame = talloc_stackframe();
 
-       lock_order = dbwrap_check_lock_order(db, frame);
+       lock_order = dbwrap_check_lock_order(db, mem_ctx);
        if (lock_order == NULL) {
-               TALLOC_FREE(frame);
                return NULL;
        }
        rec = db_fn(db, mem_ctx, key);
        if (rec == NULL) {
-               TALLOC_FREE(frame);
+               TALLOC_FREE(lock_order);
                return NULL;
        }
        (void)talloc_steal(rec, lock_order);
        rec->db = db;
-       TALLOC_FREE(frame);
        return rec;
 }