From 00a0da050331d963d4dd2134ab4983e4f4da9d29 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 9 Jun 2020 15:52:29 +0200 Subject: [PATCH] s3/torture: use stack buffer for rbtree loop Using the stack here simplifies the error paths. Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison --- source3/torture/torture.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/source3/torture/torture.c b/source3/torture/torture.c index ce9c56056f5..b83f6499757 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -12952,36 +12952,21 @@ static bool run_local_rbtree(int dummy) } for (i=0; i<1000; i++) { - char *key, *value; + char key[sizeof("key-9223372036854775807")]; + char value[sizeof("value-9223372036854775807")]; - if (asprintf(&key, "key%ld", random()) == -1) { - goto done; - } - if (asprintf(&value, "value%ld", random()) == -1) { - SAFE_FREE(key); - goto done; - } + snprintf(key, sizeof(key), "key%ld", random()); + snprintf(value, sizeof(value) ,"value%ld", random()); if (!rbt_testval(db, key, value)) { - SAFE_FREE(key); - SAFE_FREE(value); goto done; } - SAFE_FREE(value); - if (asprintf(&value, "value%ld", random()) == -1) { - SAFE_FREE(key); - goto done; - } + snprintf(value, sizeof(value) ,"value%ld", random()); if (!rbt_testval(db, key, value)) { - SAFE_FREE(key); - SAFE_FREE(value); goto done; } - - SAFE_FREE(key); - SAFE_FREE(value); } ret = true; -- 2.47.3