summaryrefslogtreecommitdiff
path: root/source3/smbd/trans2.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/trans2.c
parent68c5c6df0eeae16c56d0abc1b5ec275d18410224 (diff)
downloadsamba-5302db632660de44129d7cf48073bf52c9b27eca.tar.gz
samba-5302db632660de44129d7cf48073bf52c9b27eca.tar.bz2
samba-5302db632660de44129d7cf48073bf52c9b27eca.zip
TALLOC_FREE happily lives with a NULL ptr. Tim, please check!
Thanks, Volker
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r--source3/smbd/trans2.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index e907902c65..1748cfa0b8 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4909,12 +4909,8 @@ NTSTATUS hardlink_internals(TALLOC_CTX *ctx,
nt_errstr(status), newname, oldname));
}
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);
return status;
}
@@ -5524,9 +5520,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
FILE_WRITE_ATTRIBUTES);
}
out:
- if (smb_fname) {
- TALLOC_FREE(smb_fname);
- }
+ TALLOC_FREE(smb_fname);
return status;
}