sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

pvfs_open: unify talloc behavior in pvfs_can_delete/rename/stat()

Browse Source 
And also handle NULL for lckp in the error path
without crashing.

metze
(This used to be commit 04eb1be0c67317067ee0ca70c731fef958cd513c)
This commit is contained in:
Stefan Metzmacher 2008-02-21 19:56:36 +01:00
parent f56ff422a5
commit 6f077d4017
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source4/ntvfs/posix/pvfs_open.c
View File

@ -1461,8 +1461,10 @@ NTSTATUS pvfs_can_delete(struct pvfs_state *pvfs,
}
} else if (!NT_STATUS_IS_OK(status)) {
talloc_free(lck);
*lckp = lck;
} else if (lckp != NULL) {
if (lckp) {
*lckp = NULL;
}
} else if (lckp) {
*lckp = lck;
}
@ -1513,8 +1515,10 @@ NTSTATUS pvfs_can_rename(struct pvfs_state *pvfs,
}
} else if (!NT_STATUS_IS_OK(status)) {
talloc_free(lck);
*lckp = lck;
} else if (lckp != NULL) {
if (lckp) {
*lckp = NULL;
}
} else if (lckp) {
*lckp = lck;
}
@ -1549,6 +1553,10 @@ NTSTATUS pvfs_can_stat(struct pvfs_state *pvfs,
NTCREATEX_SHARE_ACCESS_WRITE,
0, 0);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(lck);
}
return status;
}