(no commit message)

diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 4feaf830e250c2d42df7cf96fcd406b32874e34c..7b46aa29c03700b80c279a0f89a46b00d4501a9a 100644 (file)
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -9052,6 +9052,9 @@ MagickPrivate MagickBooleanType XRenderImage(Image *image,
   resource_info.background_color=AcquireString("#ffffffffffff");
   resource_info.foreground_color=AcquireString("#000000000000");
   map_info=XAllocStandardColormap();
+  visual_info=(XVisualInfo *) NULL;
+  font_info=(XFontStruct *) NULL;
+  pixel.pixels=(unsigned long *) NULL;
   if (map_info == (XStandardColormap *) NULL)
     {
       ThrowXWindowException(ResourceLimitError,"MemoryAllocationFailed",
@@ -9064,11 +9067,12 @@ MagickPrivate MagickBooleanType XRenderImage(Image *image,
   visual_info=XBestVisualInfo(display,map_info,&resource_info);
   if (visual_info == (XVisualInfo *) NULL)
     {
+      XFreeResources(display,visual_info,map_info,&pixel,font_info,
+        &resource_info,(XWindowInfo *) NULL);
       ThrowXWindowException(XServerError,"UnableToGetVisual",image->filename);
       return(MagickFalse);
     }
   map_info->colormap=(Colormap) NULL;
-  pixel.pixels=(unsigned long *) NULL;
   /*
     Initialize Standard Colormap info.
   */
@@ -9082,17 +9086,10 @@ MagickPrivate MagickBooleanType XRenderImage(Image *image,
   */
   font_info=XBestFont(display,&resource_info,MagickFalse);
   if (font_info == (XFontStruct *) NULL)
-    {
-      ThrowXWindowException(XServerError,"UnableToLoadFont",draw_info->font);
-      return(MagickFalse);
-    }
-  if ((map_info == (XStandardColormap *) NULL) ||
-      (visual_info == (XVisualInfo *) NULL) ||
-      (font_info == (XFontStruct *) NULL))
     {
       XFreeResources(display,visual_info,map_info,&pixel,font_info,
         &resource_info,(XWindowInfo *) NULL);
-      ThrowXWindowException(XServerError,"UnableToLoadFont",image->filename);
+      ThrowXWindowException(XServerError,"UnableToLoadFont",draw_info->font);
       return(MagickFalse);
     }
   cache_info=(*draw_info);