summaryrefslogtreecommitdiffstats
path: root/source3/smbd/nttrans.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-05-24 22:13:07 +0200
committerVolker Lendecke <vl@samba.org>2009-05-24 22:13:07 +0200
commit5302db632660de44129d7cf48073bf52c9b27eca (patch)
tree2c10a40aba7d57bdcde8582fe74b3b68b0b61eff /source3/smbd/nttrans.c
parent68c5c6df0eeae16c56d0abc1b5ec275d18410224 (diff)
downloadsamba-5302db632660de44129d7cf48073bf52c9b27eca.tar.gz
samba-5302db632660de44129d7cf48073bf52c9b27eca.tar.xz
samba-5302db632660de44129d7cf48073bf52c9b27eca.zip
TALLOC_FREE happily lives with a NULL ptr. Tim, please check!
Thanks, Volker
Diffstat (limited to 'source3/smbd/nttrans.c')
-rw-r--r--source3/smbd/nttrans.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index d51c9a6d67e..204cdf9e310 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1316,12 +1316,8 @@ static NTSTATUS copy_internals(TALLOC_CTX *ctx,
goto out;
}
out:
- if (smb_fname) {
- TALLOC_FREE(smb_fname);
- }
- if (smb_fname_new) {
- TALLOC_FREE(smb_fname_new);
- }
+ TALLOC_FREE(smb_fname);
+ TALLOC_FREE(smb_fname_new);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3,("copy_internals: Error %s copy file %s to %s\n",
nt_errstr(status), oldname, newname));