move to SAFE_FREE()

(This used to be commit fc71962409e11509a60fb2be6741c32970865881)

diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index b107afc895399a254b589f1a10fc02628f9a5e9d..b70b445c084e8e09b79af60ec3fd6236a9437be8 100644 (file)
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -250,8 +250,7 @@ static void reconnect(struct cli_state *cli[NSERVERS][NCONNECTIONS], int fnum[NS
                        }
                        cli_ulogoff(cli[server][conn]);
                        cli_shutdown(cli[server][conn]);
-                       free(cli[server][conn]);
-                       cli[server][conn] = NULL;
+                       SAFE_FREE(cli[server][conn]);
                }
                cli[server][conn] = connect_one(share[server]);
                if (!cli[server][conn]) {

diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c
index 2b74b77b640b5da79704ad39dea97a0b140eeffb..734c9c44bf20fd64173784c52f5c3a70dd91768f 100644 (file)
--- a/source3/torture/locktest2.c
+++ b/source3/torture/locktest2.c
@@ -267,8 +267,7 @@ static void reconnect(struct cli_state *cli[NSERVERS][NCONNECTIONS],
                        }
                        cli_ulogoff(cli[server][conn]);
                        cli_shutdown(cli[server][conn]);
-                       free(cli[server][conn]);
-                       cli[server][conn] = NULL;
+                       SAFE_FREE(cli[server][conn]);
                }
                cli[server][conn] = connect_one(share[server]);
                if (!cli[server][conn]) {

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index c5f6708408a4daf91ef9e811c5a69a2f2b51e6e9..a6025593ff97fae01aaaec31b8901181def7054d 100644 (file)
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -71,8 +71,8 @@ static NTSTATUS try_trans2(struct cli_state *cli,
                           &rparam, rparam_len,
                           &rdata, rdata_len);
 
-       if (rdata) free(rdata);
-       if (rparam) free(rparam);
+       SAFE_FREE(rdata);
+       SAFE_FREE(rparam);
 
        return cli_nt_error(cli);
 }
@@ -273,8 +273,8 @@ static NTSTATUS try_nttrans(struct cli_state *cli,
                             &rparam, rparam_len,
                             &rdata, rdata_len);
 
-       if (rdata) free(rdata);
-       if (rparam) free(rparam);
+       SAFE_FREE(rdata);
+       SAFE_FREE(rparam);
 
        return cli_nt_error(cli);
 }