From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 17 Feb 2013 00:09:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cc0787a89ebad3271dbbe208f9115daea096210;p=imagemagick

---

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 8b423d5a3..f7e551016 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1945,6 +1945,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
       display=XOpenDisplay(draw_info->server_name);
       if (display == (Display *) NULL)
         {
+          UnlockSemaphoreInfo(annotate_semaphore);
           ThrowXWindowException(XServerError,"UnableToOpenXServer",
             draw_info->server_name);
           return(MagickFalse);
@@ -1966,6 +1967,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
       map_info=XAllocStandardColormap();
       if (map_info == (XStandardColormap *) NULL)
         {
+          UnlockSemaphoreInfo(annotate_semaphore);
           ThrowXWindowException(ResourceLimitError,"MemoryAllocationFailed",
             image->filename);
           return(MagickFalse);
@@ -1976,6 +1978,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
       visual_info=XBestVisualInfo(display,map_info,&resource_info);
       if (visual_info == (XVisualInfo *) NULL)
         {
+          UnlockSemaphoreInfo(annotate_semaphore);
           ThrowXWindowException(XServerError,"UnableToGetVisual",
             image->filename);
           return(MagickFalse);
@@ -1996,6 +1999,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
       font_info=XBestFont(display,&resource_info,MagickFalse);
       if (font_info == (XFontStruct *) NULL)
         {
+          UnlockSemaphoreInfo(annotate_semaphore);
           ThrowXWindowException(XServerError,"UnableToLoadFont",
             draw_info->font);
           return(MagickFalse);
@@ -2004,6 +2008,7 @@ static MagickBooleanType RenderX11(Image *image,const DrawInfo *draw_info,
           (visual_info == (XVisualInfo *) NULL) ||
           (font_info == (XFontStruct *) NULL))
         {
+          UnlockSemaphoreInfo(annotate_semaphore);
           XFreeResources(display,visual_info,map_info,&pixel,font_info,
             &resource_info,(XWindowInfo *) NULL);
           ThrowXWindowException(XServerError,"UnableToLoadFont",