summaryrefslogtreecommitdiff
path: root/source3/smbd/nttrans.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-12-01 14:38:19 +0100
committerVolker Lendecke <vl@sernet.de>2007-12-05 13:45:11 +0100
commitcb7706cf2c078d09f013b74685aa658af37cf5ba (patch)
treeae9fd4bbea1a00c18e23106dc6d725f7d39b6b0c /source3/smbd/nttrans.c
parent692725d9741b4602bc9ce16006eb84e546067445 (diff)
downloadsamba-cb7706cf2c078d09f013b74685aa658af37cf5ba.tar.gz
samba-cb7706cf2c078d09f013b74685aa658af37cf5ba.tar.bz2
samba-cb7706cf2c078d09f013b74685aa658af37cf5ba.zip
TALLOC_FREE early
(This used to be commit 4b1f0d1d93d1e7bd0b4fa641d4e9629af8234d71)
Diffstat (limited to 'source3/smbd/nttrans.c')
-rw-r--r--source3/smbd/nttrans.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 4d5e107ca6..12709f9e02 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -593,6 +593,7 @@ void reply_ntcreate_and_X(connection_struct *conn,
* This filename is relative to a directory fid.
*/
char *parent_fname = NULL;
+ char *tmp;
files_struct *dir_fsp = file_fsp(root_dir_fid);
if(!dir_fsp) {
@@ -668,12 +669,14 @@ void reply_ntcreate_and_X(connection_struct *conn,
}
}
- fname = talloc_asprintf(ctx, "%s%s", parent_fname, fname);
- if (fname == NULL) {
+ tmp = talloc_asprintf(ctx, "%s%s", parent_fname, fname);
+ if (tmp == NULL) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
END_PROFILE(SMBntcreateX);
return;
}
+ TALLOC_FREE(fname);
+ fname = tmp;
} else {
/*
* Check to see if this is a mac fork of some kind.
@@ -1363,6 +1366,7 @@ static void call_nt_transact_create(connection_struct *conn,
* This filename is relative to a directory fid.
*/
char *parent_fname = NULL;
+ char *tmp;
files_struct *dir_fsp = file_fsp(root_dir_fid);
if(!dir_fsp) {
@@ -1433,12 +1437,14 @@ static void call_nt_transact_create(connection_struct *conn,
}
}
- fname = talloc_asprintf(ctx, "%s%s", parent_fname, fname);
- if (fname == NULL) {
+ tmp = talloc_asprintf(ctx, "%s%s", parent_fname, fname);
+ if (tmp == NULL) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
END_PROFILE(SMBntcreateX);
return;
}
+ TALLOC_FREE(fname);
+ fname = tmp;
} else {
/*
* Check to see if this is a mac fork of some kind.