Minor cleanups to ensure we free memory allocated for keys.

3 files changed, 6 insertions, 3 deletions

diff --git a/test/format/bulk.c b/test/format/bulk.c
index 7cf4ba559dc..203043166a4 100644
--- a/test/format/bulk.c
+++ b/test/format/bulk.c
@@ -39,6 +39,7 @@ wts_load(void)
 	int is_bulk, ret;
 
 	conn = g.wts_conn;
+	keybuf = valbuf = NULL;
 
 	if ((ret = conn->open_session(conn, NULL, NULL, &session)) != 0)
 		die(ret, "connection.open_session");
diff --git a/test/format/lrt.c b/test/format/lrt.c
index 1e7ebe02ddc..85b6e29f224 100644
--- a/test/format/lrt.c
+++ b/test/format/lrt.c
@@ -47,6 +47,7 @@ lrt(void *arg)
 	void *buf;
 
 	(void)(arg);			/* Unused parameter */
+
 	saved_keyno = 0;		/* [-Werror=maybe-uninitialized] */
 
 	key_gen_setup(&keybuf);
@@ -168,6 +169,7 @@ lrt(void *arg)
 	if ((ret = session->close(session, NULL)) != 0)
 		die(ret, "session.close");
 
+	free(keybuf);
 	free(buf);
 
 	return (NULL);
diff --git a/test/format/ops.c b/test/format/ops.c
index 3c76a8fcc12..7ed806322cd 100644
--- a/test/format/ops.c
+++ b/test/format/ops.c
@@ -238,13 +238,13 @@ ops(void *arg)
 
 	tinfo = arg;
 
-	/* Initialize the per-thread random number generator. */
-	__wt_random_init(&tinfo->rnd);
-
 	conn = g.wts_conn;
 	keybuf = valbuf = NULL;
 	readonly = 0;			/* -Wconditional-uninitialized */
 
+	/* Initialize the per-thread random number generator. */
+	__wt_random_init(&tinfo->rnd);
+
 	/* Set up the default key and value buffers. */
 	key_gen_setup(&keybuf);
 	val_gen_setup(&tinfo->rnd, &valbuf);