sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-25 00:23:52 +03:00
Code Activity

r23080: Fix bug #4637 - we hads missed some cases where

Browse Source 
we were calling PRS_ALLOC_MEM with zero count.
Jeremy.
(This used to be commit 9a10736e6f)
This commit is contained in:
Jeremy Allison
2007-05-22 20:20:01 +00:00
committed by Gerald (Jerry) Carter
parent 725e90f157
commit 71ee55f98d
7 changed files with 120 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source3/libads/authdata.c
View File

@@ -120,10 +120,14 @@ static BOOL pac_io_krb_sid_and_attr_array(const char *desc,
return False;
if (UNMARSHALLING(ps)) {
array->krb_sid_and_attrs = PRS_ALLOC_MEM(ps, KRB_SID_AND_ATTRS, num);
if (!array->krb_sid_and_attrs) {
DEBUG(3, ("No memory available\n"));
return False;
if (num) {
array->krb_sid_and_attrs = PRS_ALLOC_MEM(ps, KRB_SID_AND_ATTRS, num);
if (!array->krb_sid_and_attrs) {
DEBUG(3, ("No memory available\n"));
return False;
}
} else {
array->krb_sid_and_attrs = NULL;
}
}
@@ -184,10 +188,14 @@ static BOOL pac_io_group_membership_array(const char *desc,
return False;
if (UNMARSHALLING(ps)) {
array->group_membership = PRS_ALLOC_MEM(ps, GROUP_MEMBERSHIP, num);
if (!array->group_membership) {
DEBUG(3, ("No memory available\n"));
return False;
if (num) {
array->group_membership = PRS_ALLOC_MEM(ps, GROUP_MEMBERSHIP, num);
if (!array->group_membership) {
DEBUG(3, ("No memory available\n"));
return False;
}
} else {
array->group_membership = NULL;
}
}
@@ -456,10 +464,14 @@ static BOOL pac_io_pac_signature_data(const char *desc,
return False;
if (UNMARSHALLING(ps) && length) {
data->signature.buffer = PRS_ALLOC_MEM(ps, uint8, siglen);
if (!data->signature.buffer) {
DEBUG(3, ("No memory available\n"));
return False;
if (siglen) {
data->signature.buffer = PRS_ALLOC_MEM(ps, uint8, siglen);
if (!data->signature.buffer) {
DEBUG(3, ("No memory available\n"));
return False;
}
} else {
data->signature.buffer = NULL;
}
}