From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Tue, 9 Jan 2018 23:09:36 +0000 (+0100)
Subject: Fixed memory leak
X-Git-Tag: 7.0.7-22~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5727cb528230da631d6ccad1f5de20e6d0891fd1;p=imagemagick

Fixed memory leak
Credit to OSS-Fuzz
---

diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index b0b3f2152..bacf348a2 100644
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -1,7 +1,7 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
 // Copyright Bob Friesenhahn, 1999, 2000, 2001, 2002, 2003
-// Copyright Dirk Lemstra 2014-2016
+// Copyright Dirk Lemstra 2014-2018
 //
 // Implementation of Options
 //
@@ -394,10 +394,10 @@ void Magick::Options::magick(const std::string &magick_)
     magick_.c_str());
   GetPPException;
   SetImageInfo(_imageInfo,1,exceptionInfo);
+  ThrowPPException(_quiet);
   if ( _imageInfo->magick[0] == '\0' )
     throwExceptionExplicit(MagickCore::OptionError,"Unrecognized image format",
       magick_.c_str());
-  ThrowPPException(_quiet);
 }
 
 std::string Magick::Options::magick(void) const