summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-12-21 04:34:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:43 -0500
commit99f0355eb5fbc20e37a312977c97b5d378fff2bf (patch)
tree1ea01d3b18a946f45233f4f01a11db6592d9398a /source3
parentad94eabdc643c2f980bd664231d1ec6216a215cd (diff)
downloadsamba-99f0355eb5fbc20e37a312977c97b5d378fff2bf.tar.gz
samba-99f0355eb5fbc20e37a312977c97b5d378fff2bf.tar.bz2
samba-99f0355eb5fbc20e37a312977c97b5d378fff2bf.zip
r4305: Fix from Albert Chin (china@thewrittenword.com) to fix the
earlier malloc changes. Jeremy. (This used to be commit da7ef2517162740bc61a81ae814d48348aa513d5)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/sysacls.c10
-rw-r--r--source3/lib/util_smbd.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index f5801af8c5..4484810884 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -722,7 +722,7 @@ SMB_ACL_T sys_acl_init(int count)
* acl[] array, this actually allocates an ACL with room
* for (count+1) entries
*/
- if ((a = SMB_MALLOC(sizeof(*a) + count * sizeof(struct acl))) == NULL) {
+ if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
errno = ENOMEM;
return NULL;
}
@@ -1353,7 +1353,7 @@ SMB_ACL_T sys_acl_init(int count)
* acl[] array, this actually allocates an ACL with room
* for (count+1) entries
*/
- if ((a = SMB_MALLOC(sizeof(*a) + count * sizeof(struct acl))) == NULL) {
+ if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + count * sizeof(struct acl))) == NULL) {
errno = ENOMEM;
return NULL;
}
@@ -1982,7 +1982,7 @@ SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
{
SMB_ACL_T a;
- if ((a = SMB_MALLOC_P(SMB_ACL_T)) == NULL) {
+ if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
errno = ENOMEM;
return NULL;
}
@@ -1999,7 +1999,7 @@ SMB_ACL_T sys_acl_get_fd(int fd)
{
SMB_ACL_T a;
- if ((a = SMB_MALLOC_P(SMB_ACL_T)) == NULL) {
+ if ((a = SMB_MALLOC_P(struct SMB_ACL_T)) == NULL) {
errno = ENOMEM;
return NULL;
}
@@ -2056,7 +2056,7 @@ SMB_ACL_T sys_acl_init(int count)
return NULL;
}
- if ((a = SMB_MALLOC_P(struct acl)) == NULL) {
+ if ((a = SMB_MALLOC(sizeof(struct SMB_ACL_T) + sizeof(struct acl))) == NULL) {
errno = ENOMEM;
return NULL;
}
diff --git a/source3/lib/util_smbd.c b/source3/lib/util_smbd.c
index 2eb0bb7cc0..58e7d9c627 100644
--- a/source3/lib/util_smbd.c
+++ b/source3/lib/util_smbd.c
@@ -54,7 +54,7 @@ BOOL getgroups_user(const char *user, gid_t primary_gid, gid_t **ret_groups, int
gid_t *groups_tmp;
- groups_tmp = SMB_REALLOC(temp_groups, gid_t, max_grp);
+ groups_tmp = SMB_REALLOC_ARRAY(temp_groups, gid_t, max_grp);
if (!groups_tmp) {
SAFE_FREE(temp_groups);