* image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo

and free it with DestroyExceptionInfo.

Fixes: debbugs:11558

diff --git a/src/ChangeLog b/src/ChangeLog
index 26019c1302d849a99606a5bb595f53dd8e4b5497..9161d4c40de7d4149f5b3d0b57e8927cc066b906 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13  Kalle Kankare <kalle.kankare@iki.fi> (tiny change)
+
+       * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo
+       and free it with DestroyExceptionInfo (Bug#11558).
+
 2012-07-13  Juanma Barranquero  <lekktu@gmail.com>
 
        * s/ms-w32.h (FIRST_PTY_LETTER, HAVE_SOCKETS): Move to nt/config.nt.

diff --git a/src/image.c b/src/image.c
index 88d2f36cda9b212ef95a8508458818c5176b3323..6f2afb28cd297225488a85742379f38e82dc52f0 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7968,9 +7968,14 @@ and `imagemagick-types-inhibit'.  */)
   Lisp_Object typelist = Qnil;
   size_t numf = 0;
   ExceptionInfo ex;
-  char **imtypes = GetMagickList ("*", &numf, &ex);
+  char **imtypes;
   size_t i;
   Lisp_Object Qimagemagicktype;
+
+  GetExceptionInfo(&ex);
+  imtypes = GetMagickList ("*", &numf, &ex);
+  DestroyExceptionInfo(&ex);
+
   for (i = 0; i < numf; i++)
     {
       Qimagemagicktype = intern (imtypes[i]);