[Emacs-diffs] /srv/bzr/emacs/trunk r109072: * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo

[Jan D.]

------------------------------------------------------------
revno: 109072
fixes bug: http://debbugs.gnu.org/11558
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-13 14:20:07 +0200
message:
  * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo
  and free it with DestroyExceptionInfo.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-13 11:49:26 +0000
+++ b/src/ChangeLog     2012-07-13 12:20:07 +0000
@@ -1,3 +1,8 @@
+2012-07-13  Kalle Kankare <address@hidden> (tiny change)
+
+       * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo
+       and free it with DestroyExceptionInfo (Bug#11558).
+
 2012-07-13  Juanma Barranquero  <address@hidden>
 
        * s/ms-w32.h (FIRST_PTY_LETTER, HAVE_SOCKETS): Move to nt/config.nt.

=== modified file 'src/image.c'
--- a/src/image.c       2012-07-10 23:24:36 +0000
+++ b/src/image.c       2012-07-13 12:20:07 +0000
@@ -7968,9 +7968,14 @@
   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]);