[PATCH 2/2] source4/libcli: Only set ctemp set on success
samlang at gmail.com
samlang at gmail.com
Wed Apr 17 09:56:35 MDT 2013
From: Sam Lang <sam.lang at inktank.com>
If open fails ctemp.out.name probably won't be valid and strdup
will cause a segv. Only set the path if open succeeds.
Signed-off-by: Sam Lang <sam.lang at inktank.com>
---
source4/libcli/clifile.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c
index f5e02dd..6568de7 100644
--- a/source4/libcli/clifile.c
+++ b/source4/libcli/clifile.c
@@ -663,11 +663,11 @@ int smbcli_ctemp(struct smbcli_tree *tree, const char *path, char **tmp_path)
open_parms.ctemp.in.write_time = 0;
status = smb_raw_open(tree, mem_ctx, &open_parms);
- if (tmp_path) {
- *tmp_path = strdup(open_parms.ctemp.out.name);
- }
talloc_free(mem_ctx);
if (NT_STATUS_IS_OK(status)) {
+ if (tmp_path) {
+ *tmp_path = strdup(open_parms.ctemp.out.name);
+ }
return open_parms.ctemp.out.file.fnum;
}
return -1;
--
1.7.10.4
More information about the samba-technical
mailing list