ext/RMagick/rminfo.c in rmagick-1.11.0 vs ext/RMagick/rminfo.c in rmagick-1.11.1
- old
+ new
@@ -1,6 +1,6 @@
-/* $Id: rminfo.c,v 1.37 2006/05/07 21:41:12 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.38 2006/05/27 21:05:59 rmagick Exp $ */
/*============================================================================\
| Copyright (C) 2006 by Timothy P. Hunter
| Name: rminfo.c
| Author: Tim Hunter
| Purpose: Info class method definitions for RMagick.
@@ -139,10 +139,12 @@
}
GetExceptionInfo(&exception);
okay = AddDefinitions(info, definitions, &exception);
CHECK_EXCEPTION()
+ DestroyExceptionInfo(&exception);
+
if (!okay)
{
rb_warn("%.60s:%.1024s not defined - AddDefinitions failed.", format_p, key_p);
return Qnil;
}
@@ -407,10 +409,12 @@
}
GetExceptionInfo(&exception);
okay = AddDefinitions(info, definitions, &exception);
CHECK_EXCEPTION()
+ DestroyExceptionInfo(&exception);
+
if (!okay)
{
rb_warn("%.*s not defined - AddDefinitions failed.", sizeof(definitions), definitions);
return Qnil;
}
@@ -912,10 +916,12 @@
Data_Get_Struct(self, Info, info);
if (*info->magick)
{
GetExceptionInfo(&exception);
magick_info = GetMagickInfo(info->magick, &exception);
+ DestroyExceptionInfo(&exception);
+
return magick_info ? rb_str_new2(magick_info->name) : Qnil;
}
return Qnil;
}
@@ -937,9 +943,10 @@
GetExceptionInfo(&exception);
mgk = STRING_PTR(magick);
m = GetMagickInfo(mgk, &exception);
CHECK_EXCEPTION()
+ DestroyExceptionInfo(&exception);
if (!m)
{
rb_raise(rb_eArgError, "unknown format: %s", mgk);
}