summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-02-13 15:05:40 +0100
committerStefan Metzmacher <metze@samba.org>2013-02-18 15:56:04 +0100
commit2f8a033bf2563d547e42be5603074223078595f9 (patch)
tree8765b9819da036c85cdd577e1820a77f4c9526f7
parent1d3bd45d6177c8af653dbacac934eb2061acf35e (diff)
downloadsamba-2f8a033bf2563d547e42be5603074223078595f9.tar.gz
samba-2f8a033bf2563d547e42be5603074223078595f9.tar.bz2
samba-2f8a033bf2563d547e42be5603074223078595f9.zip
s4:torture:smb2: fix segfault on error condition in the durable-open.delete_on_close2 test
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source4/torture/smb2/durable_open.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index 89a6be854b..eea8747037 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -897,13 +897,15 @@ static bool test_durable_open_delete_on_close2(struct torture_context *tctx,
CHECK_VAL(io.out.oplock_level, smb2_util_oplock_level("b"));
done:
- if (h != NULL) {
- smb2_util_close(tree, *h);
- }
+ if (tree != NULL) {
+ if (h != NULL) {
+ smb2_util_close(tree, *h);
+ }
- smb2_util_unlink(tree, fname);
+ smb2_util_unlink(tree, fname);
- talloc_free(tree);
+ talloc_free(tree);
+ }
talloc_free(mem_ctx);