summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-07-15 09:37:36 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:37 -0500
commit33068885e62f3681644c128e381822d48298ea05 (patch)
treea2a3c4fe7e41febed15cc8deb9f0320628e1690a /source
parentcc41b3b60f5e0c604a764bc5bb1f8ecfe13a36f6 (diff)
downloadsamba-33068885e62f3681644c128e381822d48298ea05.tar.gz
samba-33068885e62f3681644c128e381822d48298ea05.tar.xz
samba-33068885e62f3681644c128e381822d48298ea05.zip
r23877: Fix two segfaults in (very unlikely) error paths, found by the IBM
checker.
Diffstat (limited to 'source')
-rw-r--r--source/smbd/trans2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 1659c8fcbdb..080eb36b420 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -2998,6 +2998,7 @@ static BOOL marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
uid_t *puid = (uid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry);
if (!puid) {
DEBUG(0,("marshall_posix_acl: SMB_VFS_SYS_ACL_GET_QUALIFIER failed.\n"));
+ return False;
}
own_grp = (unsigned int)*puid;
SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)puid,tagtype);
@@ -3017,6 +3018,7 @@ static BOOL marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
gid_t *pgid= (gid_t *)SMB_VFS_SYS_ACL_GET_QUALIFIER(conn, entry);
if (!pgid) {
DEBUG(0,("marshall_posix_acl: SMB_VFS_SYS_ACL_GET_QUALIFIER failed.\n"));
+ return False;
}
own_grp = (unsigned int)*pgid;
SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)pgid,tagtype);