summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-05-23 03:53:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:28 -0500
commit507e502c352ff53952fa704f1bde5accc0bd8f1a (patch)
tree1d3d12f053133770c50e0a5697d33422ce7718cf
parentae034247efdd380ecf0588846ca2fe959e4d1e48 (diff)
downloadsamba-507e502c352ff53952fa704f1bde5accc0bd8f1a.tar.gz
samba-507e502c352ff53952fa704f1bde5accc0bd8f1a.tar.bz2
samba-507e502c352ff53952fa704f1bde5accc0bd8f1a.zip
r15826: ensure we don't dereference sec when NULL
(This used to be commit b6bf6b17cd92a3869c49209bc8ea8ef8c6c25cdd)
-rw-r--r--source4/ntvfs/unixuid/vfs_unixuid.c3
1 files changed, 2 insertions, 1 deletions
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)