From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 23 Jul 2017 23:15:46 +0000 (-0400)
Subject: Be safe, call libraw_strerr() before we close the library
X-Git-Tag: 7.0.6-3~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c80c7f6fa49e4a19e620399d418ac285e68ffafe;p=imagemagick

Be safe, call libraw_strerr() before we close the library
---

diff --git a/coders/dng.c b/coders/dng.c
index b25ea95e7..e58dc5167 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -228,18 +228,18 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
     errcode=libraw_unpack(raw_info);
     if (errcode != LIBRAW_SUCCESS)
       {
-        libraw_close(raw_info);
         (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
           libraw_strerror(errcode),"`%s'",image->filename);
+        libraw_close(raw_info);
         return(DestroyImageList(image));
       }
     raw_info->params.output_bps=16;
     errcode=libraw_dcraw_process(raw_info);
     if (errcode != LIBRAW_SUCCESS)
       {
-        libraw_close(raw_info);
         (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
           libraw_strerror(errcode),"`%s'",image->filename);
+        libraw_close(raw_info);
         return(DestroyImageList(image));
       }
     raw_image=libraw_dcraw_make_mem_image(raw_info,&errcode);
@@ -250,9 +250,9 @@ static Image *ReadDNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
       {
         if (raw_image != (libraw_processed_image_t *) NULL)
           libraw_dcraw_clear_mem(raw_image);
-        libraw_close(raw_info);
         (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
           libraw_strerror(errcode),"`%s'",image->filename);
+        libraw_close(raw_info);
         return(DestroyImageList(image));
       }
     image->columns=raw_image->width;