diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-07-15 09:37:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:37 -0500 |
| commit | 3912eebdc94021d6be9fd9e0115b8b67f241b9bc (patch) | |
| tree | 84d4f29a1c65867836a70ed1e2f3e965be3c80ba | |
| parent | 2e6b56061d2e66460e542a7227b96e363fce02f1 (diff) | |
| download | samba-3912eebdc94021d6be9fd9e0115b8b67f241b9bc.tar.gz samba-3912eebdc94021d6be9fd9e0115b8b67f241b9bc.tar.bz2 samba-3912eebdc94021d6be9fd9e0115b8b67f241b9bc.zip | |
r23877: Fix two segfaults in (very unlikely) error paths, found by the IBM
checker.
(This used to be commit 33068885e62f3681644c128e381822d48298ea05)
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 1659c8fcbd..080eb36b42 100644 --- a/source3/smbd/trans2.c +++ b/source3/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); |