mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 04:30:45 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
and free it with DestroyExceptionInfo.

Fixes: debbugs:11558
This commit is contained in:
Jan Djärv 2012-07-13 14:20:07 +02:00
parent ef099b57b6
commit 2277de02b9
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

7
src/image.c
View file

@ -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]);