From a07d253fda667b748fdfd46de289171199878560 Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Fri, 19 Dec 2003 01:43:44 +0000 Subject: A small fix to torture.c to cleanup the error handling and prevent crashes. I really should clean up the comment as well. (This used to be commit 34351e457a0d9c494653179429fb71453d1d838e) --- source3/torture/torture.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/torture.c b/source3/torture/torture.c index bf3f0c6194..1708f334f3 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -2792,8 +2792,8 @@ static BOOL run_oplock3(int dummy) */ static BOOL run_deletetest(int dummy) { - struct cli_state *cli1; - struct cli_state *cli2; + struct cli_state *cli1 = NULL; + struct cli_state *cli2 = NULL; const char *fname = "\\delete.file"; int fnum1 = -1; int fnum2 = -1; @@ -3201,15 +3201,15 @@ static BOOL run_deletetest(int dummy) * intialized, because these functions don't handle * uninitialized connections. */ - cli_close(cli1, fnum1); - cli_close(cli1, fnum2); + if (fnum1 != -1) cli_close(cli1, fnum1); + if (fnum2 != -1) cli_close(cli1, fnum2); cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - if (!torture_close_connection(cli1)) { + if (cli1 && !torture_close_connection(cli1)) { correct = False; } - if (!torture_close_connection(cli2)) { + if (cli2 && !torture_close_connection(cli2)) { correct = False; } return correct; -- cgit