mirror of
https://github.com/samba-team/samba.git
synced 2025-11-23 20:23:50 +03:00
r22852: merge fixes for CVE-2007-2446 and CVE-2007-2447 to all branches
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
34f77af02e
commit
f65214be68
@@ -183,13 +183,12 @@ BOOL sec_io_acl(const char *desc, SEC_ACL **ppsa, prs_struct *ps, int depth)
|
||||
return False;
|
||||
|
||||
if (UNMARSHALLING(ps)) {
|
||||
/*
|
||||
* Even if the num_aces is zero, allocate memory as there's a difference
|
||||
* between a non-present DACL (allow all access) and a DACL with no ACE's
|
||||
* (allow no access).
|
||||
*/
|
||||
if((psa->aces = PRS_ALLOC_MEM(ps, SEC_ACE, psa->num_aces+1)) == NULL)
|
||||
return False;
|
||||
if (psa->num_aces) {
|
||||
if((psa->aces = PRS_ALLOC_MEM(ps, SEC_ACE, psa->num_aces)) == NULL)
|
||||
return False;
|
||||
} else {
|
||||
psa->aces = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < psa->num_aces; i++) {
|
||||
|
||||
Reference in New Issue
Block a user