From bbb18875dcd92f1691a1ab0aa1400b73609cb111 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 24 Jun 2015 11:47:31 +1200 Subject: [PATCH] Avoid segfault in durable_open tests There are "goto done"s hiding in CHECK_STATUS in parts of the code where tree1 is unequivocally NULL. Signed-off-by: Douglas Bagnall Reviewed-by: Michael Adam Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Jun 26 05:12:02 CEST 2015 on sn-devel-104 --- source4/torture/smb2/durable_open.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c index fd6af33eb01..bb32f96e9ec 100644 --- a/source4/torture/smb2/durable_open.c +++ b/source4/torture/smb2/durable_open.c @@ -2136,12 +2136,14 @@ static bool test_durable_open_open2_lease(struct torture_context *tctx, h1 = io1.out.file.handle; done: + if (tree1 != NULL){ + smb2_util_close(tree1, h1); + smb2_util_unlink(tree1, fname); + talloc_free(tree1); + } + smb2_util_close(tree2, h2); smb2_util_unlink(tree2, fname); - smb2_util_close(tree1, h1); - smb2_util_unlink(tree1, fname); - - talloc_free(tree1); talloc_free(tree2); return ret; -- 2.11.4.GIT