From 812391f15ffd968bd27fb3847dbb63c72adb5eec Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 17 Mar 2011 22:12:21 +1030 Subject: [PATCH] tdb2: avoid writing uninitialized bytes in test/layout.c --- ccan/tdb2/test/layout.c | 2 ++ ccan/tdb2/test/run-03-coalesce.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ccan/tdb2/test/layout.c b/ccan/tdb2/test/layout.c index ad775c8a..16f07719 100644 --- a/ccan/tdb2/test/layout.c +++ b/ccan/tdb2/test/layout.c @@ -252,6 +252,8 @@ struct tdb_context *tdb_layout_get(struct tdb_layout *layout) } mem = malloc(off); + /* Fill with some weird pattern. */ + memset(mem, 0x99, off); /* Now populate our header, cribbing from a real TDB header. */ tdb = tdb_open(NULL, TDB_INTERNAL, O_RDWR, 0, &tap_log_attr); memcpy(mem, tdb->map_ptr, sizeof(struct tdb_header)); diff --git a/ccan/tdb2/test/run-03-coalesce.c b/ccan/tdb2/test/run-03-coalesce.c index 7325a449..ffa2b6c9 100644 --- a/ccan/tdb2/test/run-03-coalesce.c +++ b/ccan/tdb2/test/run-03-coalesce.c @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) key.dsize = 5; /* No coalescing can be done due to EOF */ - layout = new_tdb_layout(NULL); + layout = new_tdb_layout("run-03-coalesce.tdb"); tdb_layout_add_freetable(layout); len = 1024; tdb_layout_add_free(layout, len, 0); @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) tdb_layout_free(layout); /* No coalescing can be done due to used record */ - layout = new_tdb_layout(NULL); + layout = new_tdb_layout("run-03-coalesce.tdb"); tdb_layout_add_freetable(layout); tdb_layout_add_free(layout, 1024, 0); tdb_layout_add_used(layout, key, data, 6); @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) tdb_layout_free(layout); /* Coalescing can be done due to two free records, then EOF */ - layout = new_tdb_layout(NULL); + layout = new_tdb_layout("run-03-coalesce.tdb"); tdb_layout_add_freetable(layout); tdb_layout_add_free(layout, 1024, 0); tdb_layout_add_free(layout, 2048, 0); @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) tdb_layout_free(layout); /* Coalescing can be done due to two free records, then data */ - layout = new_tdb_layout(NULL); + layout = new_tdb_layout("run-03-coalesce.tdb"); tdb_layout_add_freetable(layout); tdb_layout_add_free(layout, 1024, 0); tdb_layout_add_free(layout, 512, 0); @@ -124,7 +124,7 @@ int main(int argc, char *argv[]) tdb_layout_free(layout); /* Coalescing can be done due to three free records, then EOF */ - layout = new_tdb_layout(NULL); + layout = new_tdb_layout("run-03-coalesce.tdb"); tdb_layout_add_freetable(layout); tdb_layout_add_free(layout, 1024, 0); tdb_layout_add_free(layout, 512, 0); -- 2.39.5