Initialise private arrays with calloc, rather than standard malloc.
(Benjamin Herrenschmidt)
This commit is contained in:
parent
691669c012
commit
5c5c51fa6d
|
@ -398,9 +398,8 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
|
|||
pmap->devPrivates = NULL;
|
||||
else
|
||||
{
|
||||
pmap->devPrivates = (DevUnion *) xalloc (
|
||||
colormapPrivateCount * sizeof(DevUnion));
|
||||
|
||||
pmap->devPrivates = (DevUnion *) xcalloc (
|
||||
sizeof(DevUnion), colormapPrivateCount);
|
||||
if (!pmap->devPrivates)
|
||||
{
|
||||
FreeResource (mid, RT_NONE);
|
||||
|
|
|
@ -347,10 +347,13 @@ AllocateColormapPrivateIndex (InitCmapPrivFunc initPrivFunc)
|
|||
{
|
||||
privs = (DevUnion *) xrealloc (pColormap->devPrivates,
|
||||
colormapPrivateCount * sizeof(DevUnion));
|
||||
|
||||
if (!privs) {
|
||||
colormapPrivateCount--;
|
||||
return -1;
|
||||
}
|
||||
bzero(&privs[index], sizeof(DevUnion));
|
||||
pColormap->devPrivates = privs;
|
||||
|
||||
if (!privs || !(*initPrivFunc)(pColormap,index))
|
||||
if (!(*initPrivFunc)(pColormap,index))
|
||||
{
|
||||
colormapPrivateCount--;
|
||||
return -1;
|
||||
|
|
Loading…
Reference in New Issue
Block a user