From 2f4a6d60ef3c332c4379337a6354f9d5b78646c6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 13 Jan 2002 11:46:04 +0000 Subject: don't try to allocate zero bytes (This used to be commit d09616da6823b69a03a8a008987c4eb02ca0061b) --- source3/groupdb/mapping.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'source3/groupdb/mapping.c') diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index e732f26c15..c4166ac259 100644 --- a/source3/groupdb/mapping.c +++ b/source3/groupdb/mapping.c @@ -530,11 +530,10 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map, BOOL with_priv) ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "d", &set->count); DEBUG(10,("get_group_map_from_sid: %d privileges\n", map->priv_set.count)); - - set->set=(LUID_ATTR *)malloc(set->count*sizeof(LUID_ATTR)); - if (set->set==NULL) { - DEBUG(0,("get_group_map_from_sid: could not allocate memory for privileges\n")); - return False; + + set->set = NULL; + if (set->count) { + set->set=(LUID_ATTR *)smb_xmalloc(set->count*sizeof(LUID_ATTR)); } for (i=0; icount; i++) @@ -591,11 +590,9 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map, BOOL with_priv) set=&map->priv_set; ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "d", &set->count); - - set->set=(LUID_ATTR *)malloc(set->count*sizeof(LUID_ATTR)); - if (set->set==NULL) { - DEBUG(0,("get_group_map_from_gid: could not allocate memory for privileges\n")); - return False; + set->set = NULL; + if (set->count) { + set->set=(LUID_ATTR *)smb_xmalloc(set->count*sizeof(LUID_ATTR)); } for (i=0; icount; i++) -- cgit