From 507e502c352ff53952fa704f1bde5accc0bd8f1a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 23 May 2006 03:53:23 +0000 Subject: r15826: ensure we don't dereference sec when NULL (This used to be commit b6bf6b17cd92a3869c49209bc8ea8ef8c6c25cdd) --- source4/ntvfs/unixuid/vfs_unixuid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index 9afb2b1380..b12339b2c8 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -191,7 +191,8 @@ static NTSTATUS unixuid_setup_security(struct ntvfs_module_context *ntvfs, NTSTATUS status2; \ struct unix_sec_ctx *sec; \ status = unixuid_setup_security(ntvfs, req, &sec); \ - if (NT_STATUS_IS_OK(status)) status = ntvfs_next_##op args; \ + NT_STATUS_NOT_OK_RETURN(status); \ + status = ntvfs_next_##op args; \ status2 = set_unix_security(sec); \ if (!NT_STATUS_IS_OK(status2)) smb_panic("Unable to reset security context"); \ } while (0) -- cgit