rmagick 2.13.4 → 2.16.0

data/ext/RMagick/rmagick.c

@@ -34,7 +34,7 @@ Magick_colors(VALUE class)
 {
     const ColorInfo **color_info_list;
     size_t number_colors, x;
-    volatile VALUE ary;
+    VALUE ary;
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
@@ -62,6 +62,7 @@ Magick_colors(VALUE class)
         }
 
         magick_free((void *)color_info_list);
+        RB_GC_GUARD(ary);
         return ary;
     }
 }
@@ -83,7 +84,7 @@ Magick_fonts(VALUE class)
 {
     const TypeInfo **type_info;
     size_t number_types, x;
-    volatile VALUE ary;
+    VALUE ary;
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
@@ -108,6 +109,7 @@ Magick_fonts(VALUE class)
             (void) rb_ary_push(ary, Import_TypeInfo((const TypeInfo *)type_info[x]));
         }
         magick_free((void *)type_info);
+        RB_GC_GUARD(ary);
         return ary;
     }
 
@@ -167,7 +169,7 @@ Magick_init_formats(VALUE class)
 {
     const MagickInfo **magick_info;
     size_t number_formats, x;
-    volatile VALUE formats;
+    VALUE formats;
     ExceptionInfo *exception;
 
     class = class;      // defeat "never referenced" message from icc
@@ -186,6 +188,7 @@ Magick_init_formats(VALUE class)
                             , rb_str_new2(magick_info[x]->name)
                             , MagickInfo_to_format((const MagickInfo *)magick_info[x]));
     }
+    RB_GC_GUARD(formats);
     return formats;
 }
 
@@ -206,7 +209,7 @@ Magick_init_formats(VALUE class)
 VALUE
 Magick_limit_resource(int argc, VALUE *argv, VALUE class)
 {
-    volatile VALUE resource, limit;
+    VALUE resource, limit;
     ResourceType res = UndefinedResource;
     char *str;
     ID id;
@@ -280,6 +283,8 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             break;
     }
 
+    RB_GC_GUARD(resource);
+
     cur_limit = GetMagickResourceLimit(res);
 
     if (argc > 1)
@@ -287,6 +292,8 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
         (void) SetMagickResourceLimit(res, (MagickSizeType)NUM2ULONG(limit));
     }
 
+    RB_GC_GUARD(limit);
+
     return ULONG2NUM(cur_limit);
 }
 

data/ext/RMagick/rmagick.h

@@ -139,6 +139,10 @@
 #define RARRAY_PTR(a) RARRAY((a))->ptr /**< Ruby array pointer */
 #endif
 
+// Backport this macro to 1.8.6
+#if !defined(RB_GC_GUARD)
+#define RB_GC_GUARD(x) (x)
+#endif
 
 //! Convert a C string to a Ruby symbol. Used in marshal_dump/marshal_load methods
 #define CSTR2SYM(s) ID2SYM(rb_intern(s))

data/ext/RMagick/rmdraw.c

@@ -497,7 +497,7 @@ Draw_interword_spacing_eq(VALUE self, VALUE spacing)
 static VALUE
 image_to_str(Image *image)
 {
-    volatile VALUE dimg = Qnil;
+    VALUE dimg = Qnil;
     unsigned char *blob;
     size_t length;
     Info *info;
@@ -515,6 +515,8 @@ image_to_str(Image *image)
         magick_free((void*)blob);
     }
 
+    RB_GC_GUARD(dimg);
+
     return dimg;
 }
 
@@ -664,7 +666,7 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
 {
     Draw *draw;
     Pixel *pixel;
-    volatile VALUE val;
+    VALUE val;
 
     Data_Get_Struct(self, Draw, draw);
 
@@ -725,6 +727,8 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
 
     draw->primitives = rb_hash_aref(ddraw, CSTR2SYM("primitives"));
 
+    RB_GC_GUARD(val);
+
     return self;
 }
 
@@ -1051,7 +1055,7 @@ VALUE Draw_annotate(
 VALUE
 Draw_clone(VALUE self)
 {
-    volatile VALUE clone;
+    VALUE clone;
 
     clone = Draw_dup(self);
     if (OBJ_FROZEN(self))
@@ -1059,6 +1063,8 @@ Draw_clone(VALUE self)
         OBJ_FREEZE(clone);
     }
 
+    RB_GC_GUARD(clone);
+
     return clone;
 }
 
@@ -1087,7 +1093,7 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     const char *op = "Over";
     double x, y, width, height;
     CompositeOperator cop = OverCompositeOp;
-    volatile VALUE image;
+    VALUE image;
     Image *comp_img;
     struct TmpFile_Name *tmpfile_name;
     char name[MaxTextExtent];
@@ -1339,6 +1345,8 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
     // Send "primitive" to self.
     (void) rb_funcall(self, rb_intern("primitive"), 1, rb_str_new2(primitive));
 
+    RB_GC_GUARD(image);
+
     return self;
 }
 
@@ -1399,7 +1407,7 @@ VALUE
 Draw_dup(VALUE self)
 {
     Draw *draw;
-    volatile VALUE dup;
+    VALUE dup;
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
@@ -1408,6 +1416,9 @@ Draw_dup(VALUE self)
     {
         (void)rb_obj_taint(dup);
     }
+
+    RB_GC_GUARD(dup);
+
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
 }
 
@@ -1513,7 +1524,7 @@ VALUE
 Draw_initialize(VALUE self)
 {
     Draw *draw, *draw_options;
-    volatile VALUE options;
+    VALUE options;
 
     Data_Get_Struct(self, Draw, draw);
 
@@ -1522,6 +1533,8 @@ Draw_initialize(VALUE self)
     draw->info = draw_options->info;
     draw_options->info = NULL;
 
+    RB_GC_GUARD(options);
+
     return self;
 }
 
@@ -1560,12 +1573,14 @@ Draw_inspect(VALUE self)
 VALUE Draw_alloc(VALUE class)
 {
     Draw *draw;
-    volatile VALUE draw_obj;
+    VALUE draw_obj;
 
     draw = ALLOC(Draw);
     memset(draw, 0, sizeof(Draw));
     draw_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw);
 
+    RB_GC_GUARD(draw_obj);
+
     return draw_obj;
 }
 
@@ -1685,12 +1700,14 @@ VALUE
 DrawOptions_alloc(VALUE class)
 {
     Draw *draw_options;
-    volatile VALUE draw_options_obj;
+    VALUE draw_options_obj;
 
     draw_options = ALLOC(Draw);
     memset(draw_options, 0, sizeof(Draw));
     draw_options_obj = Data_Wrap_Struct(class, mark_Draw, destroy_Draw, draw_options);
 
+    RB_GC_GUARD(draw_options_obj);
+
     return draw_options_obj;
 }
 
@@ -1745,7 +1762,7 @@ DrawOptions_initialize(VALUE self)
 VALUE
 PolaroidOptions_alloc(VALUE class)
 {
-    volatile VALUE polaroid_obj;
+    VALUE polaroid_obj;
     ImageInfo *image_info;
     Draw *draw;
 
@@ -1759,6 +1776,8 @@ PolaroidOptions_alloc(VALUE class)
 
     polaroid_obj = Data_Wrap_Struct(class, NULL, destroy_Draw, draw);
 
+    RB_GC_GUARD(polaroid_obj);
+
     return polaroid_obj;
 }
 
@@ -1863,7 +1882,7 @@ static VALUE
 get_dummy_tm_img(VALUE klass)
 {
 #define DUMMY_IMG_CLASS_VAR "@@_dummy_img_"
-    volatile VALUE dummy_img = 0;
+    VALUE dummy_img = 0;
     Info *info;
     Image *image;
 
@@ -1887,6 +1906,8 @@ get_dummy_tm_img(VALUE klass)
     }
     dummy_img = rb_cv_get(klass, DUMMY_IMG_CLASS_VAR);
 
+    RB_GC_GUARD(dummy_img);
+
     return dummy_img;
 }
 
@@ -1918,7 +1939,7 @@ get_type_metrics(
  #define ATTRS_L ((int)(sizeof(attrs)-1))
     Image *image;
     Draw *draw;
-    volatile VALUE t;
+    VALUE t;
     TypeMetric metrics;
     char *text = NULL;
     long text_l;
@@ -1930,21 +1951,28 @@ get_type_metrics(
         case 1:                   // use default image
             text = rm_str2cstr(argv[0], &text_l);
 
-            for (x = 0; x < text_l; x++)
+            for (x = 0; x < text_l-1; x++)
             {
                 // Ensure text string doesn't refer to image attributes.
-                if (text[x] == '%' && x < text_l-1)
+                if (text[x] == '%')
                 {
                     int y;
                     char spec = text[x+1];
 
-                    for (y = 0; y < ATTRS_L; y++)
+                    if (spec == '%')
                     {
-                        if (spec == attrs[y])
+                        x++;
+                    }
+                    else
+                    {
+                        for (y = 0; y < ATTRS_L; y++)
                         {
-                            rb_raise(rb_eArgError,
-                                     "text string contains image attribute reference `%%%c'",
-                                     spec);
+                            if (spec == attrs[y])
+                            {
+                                rb_raise(rb_eArgError,
+                                         "text string contains image attribute reference `%%%c'",
+                                         spec);
+                            }
                         }
                     }
                 }
@@ -1987,5 +2015,8 @@ get_type_metrics(
         rb_raise(rb_eRuntimeError, "Can't measure text. Are the fonts installed? "
                  "Is the FreeType library installed?");
     }
+
+    RB_GC_GUARD(t);
+
     return Import_TypeMetric(&metrics);
 }

data/ext/RMagick/rmenum.c

@@ -78,10 +78,13 @@ VALUE
 Enum_alloc(VALUE class)
 {
    MagickEnum *magick_enum;
-   volatile VALUE enumr;
+   VALUE enumr;
 
    enumr = Data_Make_Struct(class, MagickEnum, NULL, NULL, magick_enum);
    rb_obj_freeze(enumr);
+
+   RB_GC_GUARD(enumr);
+
    return enumr;
 }
 
@@ -176,6 +179,10 @@ Enum_spaceship(VALUE self, VALUE other)
 {
     MagickEnum *this, *that;
 
+    if(CLASS_OF(self) != CLASS_OF(other)) {
+        return Qnil;
+    }
+
     Data_Get_Struct(self, MagickEnum, this);
     Data_Get_Struct(other, MagickEnum, that);
 
@@ -188,9 +195,7 @@ Enum_spaceship(VALUE self, VALUE other)
         return INT2FIX(-1);
     }
 
-    // Values are equal, check class.
-
-    return rb_funcall(CLASS_OF(self), rm_ID_spaceship, 1, CLASS_OF(other));
+    return INT2FIX(0);
 }
 
 
@@ -228,7 +233,7 @@ VALUE
 Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
 {
     VALUE super_argv[2];
-    volatile VALUE enumerators;
+    VALUE enumerators;
 
     super_argv[0] = sym;
     super_argv[1] = val;
@@ -242,6 +247,8 @@ Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
     enumerators = rb_cv_get(CLASS_OF(self), ENUMERATORS_CLASS_VAR);
     (void) rb_ary_push(enumerators, self);
 
+    RB_GC_GUARD(enumerators);
+
     return self;
 }
 
@@ -284,8 +291,8 @@ Enum_type_inspect(VALUE self)
 static VALUE
 Enum_type_values(VALUE class)
 {
-    volatile VALUE enumerators, copy;
-    volatile VALUE rv;
+    VALUE enumerators, copy;
+    VALUE rv;
     int x;
 
     enumerators = rb_cv_get(class, ENUMERATORS_CLASS_VAR);
@@ -309,6 +316,10 @@ Enum_type_values(VALUE class)
         rv = copy;
     }
 
+    RB_GC_GUARD(enumerators);
+    RB_GC_GUARD(copy);
+    RB_GC_GUARD(rv);
+
     return rv;
 }
 

data/ext/RMagick/rmfill.c

@@ -675,7 +675,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
 {
     rm_TextureFill *fill;
     Image *texture;
-    volatile VALUE texture_image;
+    VALUE texture_image;
 
     Data_Get_Struct(self, rm_TextureFill, fill);
 
@@ -686,6 +686,9 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
     (void) ReferenceImage(texture);
 
     fill->texture = texture;
+
+    RB_GC_GUARD(texture_image);
+
     return self;
 }
 

data/ext/RMagick/rmilist.c

@@ -44,7 +44,7 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
 {
     Image *images;
     Info *info;
-    volatile VALUE info_obj;
+    VALUE info_obj;
 
     if (argc > 1)
     {
@@ -74,6 +74,8 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     rm_check_image_exception(images, RetainOnError);
     rm_split(images);
 
+    RB_GC_GUARD(info_obj);
+
     return self;
 }
 
@@ -202,7 +204,7 @@ ImageList_coalesce(VALUE self)
 VALUE
 ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
 {
-    volatile VALUE source_images;
+    VALUE source_images;
     Image *dest, *source, *new_images;
     RectangleInfo geometry;
     CompositeOperator operator = OverCompositeOp;
@@ -242,6 +244,8 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
     rm_check_exception(exception, new_images, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
 
+    RB_GC_GUARD(source_images);
+
     return rm_imagelist_from_images(new_images);
 }
 
@@ -289,7 +293,7 @@ ImageList_display(VALUE self)
 {
     Image *images;
     Info *info;
-    volatile VALUE info_obj;
+    VALUE info_obj;
 
     // Create a new Info object to use with this call
     info_obj = rm_info_new();
@@ -302,6 +306,8 @@ ImageList_display(VALUE self)
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
 
+    RB_GC_GUARD(info_obj);
+
     return self;
 }
 
@@ -417,7 +423,7 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     Image *images, *new_images = NULL;
     Image *map;
     unsigned int dither = MagickFalse;
-    volatile VALUE scene, new_imagelist, t;
+    VALUE scene, new_imagelist, t;
     ExceptionInfo *exception;
 
 #if defined(HAVE_REMAPIMAGES)
@@ -465,6 +471,10 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     scene = rb_iv_get(self, "@scene");
     (void) imagelist_scene_eq(new_imagelist, scene);
 
+    RB_GC_GUARD(scene);
+    RB_GC_GUARD(new_imagelist);
+    RB_GC_GUARD(t);
+
     return new_imagelist;
 }
 
@@ -485,7 +495,7 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
 VALUE
 ImageList_montage(VALUE self)
 {
-    volatile VALUE montage_obj;
+    VALUE montage_obj;
     Montage *montage;
     Image *new_images, *images;
     ExceptionInfo *exception;
@@ -523,6 +533,8 @@ ImageList_montage(VALUE self)
 
     rm_ensure_result(new_images);
 
+    RB_GC_GUARD(montage_obj);
+
     return rm_imagelist_from_images(new_images);
 }
 
@@ -754,7 +766,7 @@ ImageList_new(void)
 VALUE
 rm_imagelist_from_images(Image *images)
 {
-    volatile VALUE new_imagelist;
+    VALUE new_imagelist;
     Image *image;
 
     if (!images)
@@ -771,6 +783,9 @@ rm_imagelist_from_images(Image *images)
     }
 
     (void) rb_iv_set(new_imagelist, "@scene", INT2FIX(0));
+
+    RB_GC_GUARD(new_imagelist);
+
     return new_imagelist;
 }
 
@@ -790,7 +805,7 @@ images_from_imagelist(VALUE imagelist)
 {
     long x, len;
     Image *head = NULL;
-    volatile VALUE images, t;
+    VALUE images, t;
 
     len = check_imagelist_length(imagelist);
 
@@ -801,9 +816,17 @@ images_from_imagelist(VALUE imagelist)
 
         t = rb_ary_entry(images, x);
         image = rm_check_destroyed(t);
+        // avoid a loop in this linked imagelist, issue #202
+        if (head == image || GetPreviousImageInList(image) != NULL)
+        {
+            image = rm_clone_image(image);
+        }
         AppendImageToList(&head, image);
     }
 
+    RB_GC_GUARD(images);
+    RB_GC_GUARD(t);
+
     return head;
 }
 
@@ -837,7 +860,10 @@ imagelist_scene_eq(VALUE imagelist, VALUE scene)
 static long
 imagelist_length(VALUE imagelist)
 {
-    volatile VALUE images = rb_iv_get(imagelist, "@images");
+    VALUE images = rb_iv_get(imagelist, "@images");
+
+    RB_GC_GUARD(images);
+
     return RARRAY_LEN(images);
 }
 
@@ -942,7 +968,7 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
     Image *new_image;
     QuantizeInfo quantize_info;
     ExceptionInfo *exception;
-    volatile VALUE new_imagelist, scene;
+    VALUE new_imagelist, scene;
 
     GetQuantizeInfo(&quantize_info);
 
@@ -1000,6 +1026,9 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
     scene = rb_iv_get(self, "@scene");
     (void) rb_iv_set(new_imagelist, "@scene", scene);
 
+    RB_GC_GUARD(new_imagelist);
+    RB_GC_GUARD(scene);
+
     return new_imagelist;
 }
 
@@ -1032,8 +1061,9 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 
     if (argc > 0 && argv[0] != Qnil)
     {
-        volatile VALUE t = rm_cur_image(argv[0]);
+        VALUE t = rm_cur_image(argv[0]);
         remap_image = rm_check_destroyed(t);
+        RB_GC_GUARD(t);
     }
 
     GetQuantizeInfo(&quantize_info);
@@ -1087,8 +1117,8 @@ ImageList_to_blob(VALUE self)
 {
     Image *images, *image;
     Info *info;
-    volatile VALUE info_obj;
-    volatile VALUE blob_str;
+    VALUE info_obj;
+    VALUE blob_str;
     void *blob = NULL;
     size_t length = 0;
     ExceptionInfo *exception;
@@ -1141,6 +1171,9 @@ ImageList_to_blob(VALUE self)
     blob_str = rb_str_new(blob, (long)length);
     magick_free((void*)blob);
 
+    RB_GC_GUARD(info_obj);
+    RB_GC_GUARD(blob_str);
+
     return blob_str;
 }
 
@@ -1164,7 +1197,7 @@ ImageList_write(VALUE self, VALUE file)
     Image *images, *img;
     Info *info;
     const MagickInfo *m;
-    volatile VALUE info_obj;
+    VALUE info_obj;
     unsigned long scene;
     ExceptionInfo *exception;
 
@@ -1230,5 +1263,8 @@ ImageList_write(VALUE self, VALUE file)
     }
 
     rm_split(images);
+
+    RB_GC_GUARD(info_obj);
+
     return self;
 }