From 5da5d1e6619ecfae6a4258dae7d41fcd94b6a860 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 24 May 2014 23:37:48 +0000 Subject: [PATCH] --- MagickCore/xwindow.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 4feaf830e..7b46aa29c 100644 --- 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); -- 2.40.0