Attachment #211755 for bug #295425




/*
% Copyright (C) 2003 - 2009 GraphicsMagick Group
% Copyright (C) 2002 ImageMagick Studio
%
% This program is covered by multiple licenses, which are described in

  for (p=font; *p != '\0'; p++)
    if ((*p == ':') || (*p == ';') || (*p == ','))
      fonts++;
  fontlist=MagickAllocateArray(char **,(fonts+1),sizeof(char *));
  if (fontlist == (char **) NULL)
    {
      MagickError3(ResourceLimitError,MemoryAllocationFailed,

      /*
        Read X server colormap.
      */
      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
      if (colors == (XColor *) NULL)
        {
          MagickError3(ResourceLimitError,MemoryAllocationFailed,

  for (i=0; i < 2; i++)
    for (j=0; j < 16; j++)
    {
      red_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
      green_map[i][j]=MagickAllocateArray(unsigned char *,
					  256,sizeof(unsigned char));
      blue_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
      if ((red_map[i][j] == (unsigned char *) NULL) ||
          (green_map[i][j] == (unsigned char *) NULL) ||
          (blue_map[i][j] == (unsigned char *) NULL))

  if (pixel->pixels != (unsigned long *) NULL)
    MagickFreeMemory(pixel->pixels);
  pixel->pixels=
    MagickAllocateArray(unsigned long *,packets,sizeof(unsigned long));
  if (pixel->pixels == (unsigned long *) NULL)
    MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,
      MagickMsg(XServerFatalError,UnableToGetPixelInfo));

      */
      max_windows+=1024;
      if (window_info == (WindowInfo *) NULL)
        window_info=MagickAllocateArray(WindowInfo *,
					max_windows,sizeof(WindowInfo));
      else
        MagickReallocMemory(WindowInfo *,window_info,max_windows*sizeof(WindowInfo));
    }

                /*
                  Get the window colormap.
                */
                colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
                if (colors == (XColor *) NULL)
                  {
                    XDestroyImage(ximage);

          *segment_info;

        if (window->segment_info == (void *) NULL)
          window->segment_info=MagickAllocateArray(void *,2,sizeof(XShmSegmentInfo));
        segment_info=(XShmSegmentInfo *) window->segment_info;
        segment_info[0].shmid=(-1);
        segment_info[0].shmaddr=NULL;

        Define Standard Colormap for StaticGray or StaticColor visual.
      */
      number_colors=image->colors;
      colors=MagickAllocateArray(XColor *,
				 visual_info->colormap_size,sizeof(XColor));
      if (colors == (XColor *) NULL)
        MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,
          UnableToCreateColormap);

        Define Standard Colormap for GrayScale or PseudoColor visual.
      */
      number_colors=image->colors;
      colors=MagickAllocateArray(XColor *,
				 visual_info->colormap_size,sizeof(XColor));
      if (colors == (XColor *) NULL)
        MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
          UnableToCreateColormap);

          /*
            Define Standard colormap for shared GrayScale or PseudoColor visual.
          */
          diversity=MagickAllocateArray(DiversityPacket *,
					image->colors,sizeof(DiversityPacket));
          if (diversity == (DiversityPacket *) NULL)
            MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
              UnableToCreateColormap);

          /*
            Read X server colormap.
          */
          server_colors=MagickAllocateArray(XColor *,
					    visual_info->colormap_size,
					    sizeof(XColor));
          if (server_colors == (XColor *) NULL)
            MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
              UnableToCreateColormap);

      /*
        Allocate color array.
      */
      colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
      if (colors == (XColor *) NULL)
        MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
          UnableToCreateColormap);

Return to bug 295425

Lines 1-5 Link Here

(-)GraphicsMagick/magick/xwindow.c (-21 / +22 lines)
1	/*	1	/*
2	% Copyright (C) 2003, 2004 GraphicsMagick Group	2	% Copyright (C) 2003 - 2009 GraphicsMagick Group
3	% Copyright (C) 2002 ImageMagick Studio	3	% Copyright (C) 2002 ImageMagick Studio
4	%	4	%
5	% This program is covered by multiple licenses, which are described in	5	% This program is covered by multiple licenses, which are described in
Lines 808-814 static char *MagickFontToList(char fon Link Here
808	for (p=font; *p != '\0'; p++)	808	for (p=font; *p != '\0'; p++)
809	if ((p == ':') \|\| (p == ';') \|\| (*p == ','))	809	if ((p == ':') \|\| (p == ';') \|\| (*p == ','))
810	fonts++;	810	fonts++;
811	fontlist=MagickAllocateMemory(char *,(fonts+1)sizeof(char *));	811	fontlist=MagickAllocateArray(char *,(fonts+1),sizeof(char ));
812	if (fontlist == (char **) NULL)	812	if (fontlist == (char **) NULL)
813	{	813	{
814	MagickError3(ResourceLimitError,MemoryAllocationFailed,	814	MagickError3(ResourceLimitError,MemoryAllocationFailed,
Lines 1103-1109 MagickExport void MagickXBestPixel(Displ Link Here
1103	/*	1103	/*
1104	Read X server colormap.	1104	Read X server colormap.
1105	*/	1105	*/
1106	colors=MagickAllocateMemory(XColor ,number_colorssizeof(XColor));	1106	colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
1107	if (colors == (XColor *) NULL)	1107	if (colors == (XColor *) NULL)
1108	{	1108	{
1109	MagickError3(ResourceLimitError,MemoryAllocationFailed,	1109	MagickError3(ResourceLimitError,MemoryAllocationFailed,
Lines 2133-2142 static void MagickXDitherImage(Image *im Link Here
2133	for (i=0; i < 2; i++)	2133	for (i=0; i < 2; i++)
2134	for (j=0; j < 16; j++)	2134	for (j=0; j < 16; j++)
2135	{	2135	{
2136	red_map[i][j]=MagickAllocateMemory(unsigned char ,256sizeof(unsigned char));	2136	red_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
2137	green_map[i][j]=MagickAllocateMemory(unsigned char *,	2137	green_map[i][j]=MagickAllocateArray(unsigned char *,
2138	256*sizeof(unsigned char));	2138	256,sizeof(unsigned char));
2139	blue_map[i][j]=MagickAllocateMemory(unsigned char ,256sizeof(unsigned char));	2139	blue_map[i][j]=MagickAllocateArray(unsigned char *,256,sizeof(unsigned char));
2140	if ((red_map[i][j] == (unsigned char *) NULL) \|\|	2140	if ((red_map[i][j] == (unsigned char *) NULL) \|\|
2141	(green_map[i][j] == (unsigned char *) NULL) \|\|	2141	(green_map[i][j] == (unsigned char *) NULL) \|\|
2142	(blue_map[i][j] == (unsigned char *) NULL))	2142	(blue_map[i][j] == (unsigned char *) NULL))
Lines 3022-3028 MagickExport void MagickXGetPixelPacket( Link Here
3022	if (pixel->pixels != (unsigned long *) NULL)	3022	if (pixel->pixels != (unsigned long *) NULL)
3023	MagickFreeMemory(pixel->pixels);	3023	MagickFreeMemory(pixel->pixels);
3024	pixel->pixels=	3024	pixel->pixels=
3025	MagickAllocateMemory(unsigned long ,packetssizeof(unsigned long));	3025	MagickAllocateArray(unsigned long *,packets,sizeof(unsigned long));
3026	if (pixel->pixels == (unsigned long *) NULL)	3026	if (pixel->pixels == (unsigned long *) NULL)
3027	MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,	3027	MagickFatalError(ResourceLimitFatalError,MemoryAllocationFailed,
3028	MagickMsg(XServerFatalError,UnableToGetPixelInfo));	3028	MagickMsg(XServerFatalError,UnableToGetPixelInfo));
Lines 4073-4080 static Image *MagickXGetWindowImage(Disp Link Here
4073	*/	4073	*/
4074	max_windows+=1024;	4074	max_windows+=1024;
4075	if (window_info == (WindowInfo *) NULL)	4075	if (window_info == (WindowInfo *) NULL)
4076	window_info=MagickAllocateMemory(WindowInfo *,	4076	window_info=MagickAllocateArray(WindowInfo *,
4077	max_windows*sizeof(WindowInfo));	4077	max_windows,sizeof(WindowInfo));
4078	else	4078	else
4079	MagickReallocMemory(WindowInfo ,window_info,max_windowssizeof(WindowInfo));	4079	MagickReallocMemory(WindowInfo ,window_info,max_windowssizeof(WindowInfo));
4080	}	4080	}
Lines 4227-4233 static Image *MagickXGetWindowImage(Disp Link Here
4227	/*	4227	/*
4228	Get the window colormap.	4228	Get the window colormap.
4229	*/	4229	*/
4230	colors=MagickAllocateMemory(XColor ,number_colorssizeof(XColor));	4230	colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
4231	if (colors == (XColor *) NULL)	4231	if (colors == (XColor *) NULL)
4232	{	4232	{
4233	XDestroyImage(ximage);	4233	XDestroyImage(ximage);
Lines 4577-4583 MagickExport void MagickXGetWindowInfo(D Link Here
4577	*segment_info;	4577	*segment_info;
4578		4578
4579	if (window->segment_info == (void *) NULL)	4579	if (window->segment_info == (void *) NULL)
4580	window->segment_info=MagickAllocateMemory(void ,2sizeof(XShmSegmentInfo));	4580	window->segment_info=MagickAllocateArray(void *,2,sizeof(XShmSegmentInfo));
4581	segment_info=(XShmSegmentInfo *) window->segment_info;	4581	segment_info=(XShmSegmentInfo *) window->segment_info;
4582	segment_info[0].shmid=(-1);	4582	segment_info[0].shmid=(-1);
4583	segment_info[0].shmaddr=NULL;	4583	segment_info[0].shmaddr=NULL;
Lines 7734-7741 MagickExport void MagickXMakeStandardCol Link Here
7734	Define Standard Colormap for StaticGray or StaticColor visual.	7734	Define Standard Colormap for StaticGray or StaticColor visual.
7735	*/	7735	*/
7736	number_colors=image->colors;	7736	number_colors=image->colors;
7737	colors=MagickAllocateMemory(XColor *,	7737	colors=MagickAllocateArray(XColor *,
7738	visual_info->colormap_size*sizeof(XColor));	7738	visual_info->colormap_size,sizeof(XColor));
7739	if (colors == (XColor *) NULL)	7739	if (colors == (XColor *) NULL)
7740	MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,	7740	MagickFatalError3(ResourceLimitError,MemoryAllocationFailed,
7741	UnableToCreateColormap);	7741	UnableToCreateColormap);
Lines 7774-7781 MagickExport void MagickXMakeStandardCol Link Here
7774	Define Standard Colormap for GrayScale or PseudoColor visual.	7774	Define Standard Colormap for GrayScale or PseudoColor visual.
7775	*/	7775	*/
7776	number_colors=image->colors;	7776	number_colors=image->colors;
7777	colors=MagickAllocateMemory(XColor *,	7777	colors=MagickAllocateArray(XColor *,
7778	visual_info->colormap_size*sizeof(XColor));	7778	visual_info->colormap_size,sizeof(XColor));
7779	if (colors == (XColor *) NULL)	7779	if (colors == (XColor *) NULL)
7780	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,	7780	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
7781	UnableToCreateColormap);	7781	UnableToCreateColormap);
Lines 7820-7827 MagickExport void MagickXMakeStandardCol Link Here
7820	/*	7820	/*
7821	Define Standard colormap for shared GrayScale or PseudoColor visual.	7821	Define Standard colormap for shared GrayScale or PseudoColor visual.
7822	*/	7822	*/
7823	diversity=MagickAllocateMemory(DiversityPacket *,	7823	diversity=MagickAllocateArray(DiversityPacket *,
7824	image->colors*sizeof(DiversityPacket));	7824	image->colors,sizeof(DiversityPacket));
7825	if (diversity == (DiversityPacket *) NULL)	7825	if (diversity == (DiversityPacket *) NULL)
7826	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,	7826	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
7827	UnableToCreateColormap);	7827	UnableToCreateColormap);
Lines 7882-7889 MagickExport void MagickXMakeStandardCol Link Here
7882	/*	7882	/*
7883	Read X server colormap.	7883	Read X server colormap.
7884	*/	7884	*/
7885	server_colors=MagickAllocateMemory(XColor *,	7885	server_colors=MagickAllocateArray(XColor *,
7886	visual_info->colormap_size*sizeof(XColor));	7886	visual_info->colormap_size,
		7887	sizeof(XColor));
7887	if (server_colors == (XColor *) NULL)	7888	if (server_colors == (XColor *) NULL)
7888	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,	7889	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
7889	UnableToCreateColormap);	7890	UnableToCreateColormap);
Lines 8023-8029 MagickExport void MagickXMakeStandardCol Link Here
8023	/*	8024	/*
8024	Allocate color array.	8025	Allocate color array.
8025	*/	8026	*/
8026	colors=MagickAllocateMemory(XColor ,number_colorssizeof(XColor));	8027	colors=MagickAllocateArray(XColor *,number_colors,sizeof(XColor));
8027	if (colors == (XColor *) NULL)	8028	if (colors == (XColor *) NULL)
8028	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,	8029	MagickFatalError3(ResourceLimitFatalError,MemoryAllocationFailed,
8029	UnableToCreateColormap);	8030	UnableToCreateColormap);