rmagick 7.1.4 → 7.1.6

data/ext/RMagick/rminfo.cpp

@@ -47,6 +47,25 @@ get_option(VALUE self, const char *key)
     return Qnil;
 }
 
+/**
+ * Raise ArgumentError if the option is one that ReadImage runs through
+ * InterpretImageProperties() and the value would make it read the file it names.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param key the option key
+ * @param value the value
+ */
+static void
+check_interpreted_option(const char *key, const char *value)
+{
+    if ((rm_strcasecmp(key, "caption") == 0 || rm_strcasecmp(key, "comment") == 0 || rm_strcasecmp(key, "label") == 0)
+        && rm_has_file_reference(value))
+    {
+        rb_raise(rb_eArgError, "the %s option must not name a file with '@'", key);
+    }
+}
+
 /**
  * Set the specified option to this value. If the value is nil just unset any
  * current value.
@@ -74,6 +93,7 @@ set_option(VALUE self, const char *key, VALUE string)
         char *value;
 
         value = StringValueCStr(string);
+        check_interpreted_option(key, value);
         SetImageOption(info, key, value);
     }
     return string;
@@ -306,6 +326,9 @@ Info_aref(int argc, VALUE *argv, VALUE self)
  *
  * - Essentially the same function as {Info#define} but paired with {Info#[]}
  * - If the value is nil it is equivalent to {Info#undefine}.
+ * - A value whose first non-blank character is '@', or that contains a %[fx:@...], %[hex:@...] or
+ *   %[pixel:@...] escape, is rejected for the "caption", "comment" and "label" keys because
+ *   ImageMagick reads the file it names.
  *
  * @overload []=(format, key)
  *   @param format [String] An image format name such as "ps" or "tiff".
@@ -315,6 +338,7 @@ Info_aref(int argc, VALUE *argv, VALUE self)
  *   @param key [String] A string that identifies the option.
  *
  * @return [Magick::Image::Info] self
+ * @raise [ArgumentError] if the "caption", "comment" or "label" value names a file with '@'
  * @see #[]
  * @see #define
  * @see #undefine
@@ -368,6 +392,7 @@ Info_aset(int argc, VALUE *argv, VALUE self)
         /* Allow any argument that supports to_s */
         value = rb_String(value);
         value_p = StringValueCStr(value);
+        check_interpreted_option(ckey, value_p);
 
         okay = SetImageOption(info, ckey, value_p);
         if (!okay)
@@ -552,10 +577,13 @@ Info_caption(VALUE self)
 
 
 /**
- * Assigns a caption to an image.
+ * Assigns a caption to an image. A caption whose first non-blank character is '@', or that
+ * contains a %[fx:@...], %[hex:@...] or %[pixel:@...] escape, is rejected because ImageMagick
+ * reads the file it names.
  *
  * @param caption [String] the caption
  * @return [String] the given value
+ * @raise [ArgumentError] if the caption names a file with '@'
  */
 VALUE
 Info_caption_eq(VALUE self, VALUE caption)
@@ -637,10 +665,13 @@ VALUE Info_comment(VALUE self)
 }
 
 /**
- * Set the comment
+ * Set the comment. A comment whose first non-blank character is '@', or that contains a
+ * %[fx:@...], %[hex:@...] or %[pixel:@...] escape, is rejected because ImageMagick reads the
+ * file it names.
  *
  * @param string [String] the comment
  * @return [String] the given comment
+ * @raise [ArgumentError] if the comment names a file with '@'
  */
 VALUE Info_comment_eq(VALUE self, VALUE string)
 {
@@ -1529,10 +1560,13 @@ VALUE Info_label(VALUE self)
 }
 
 /**
- * Set the label.
+ * Set the label. A label whose first non-blank character is '@', or that contains a
+ * %[fx:@...], %[hex:@...] or %[pixel:@...] escape, is rejected because ImageMagick reads the
+ * file it names.
  *
  * @param string [String] the label
  * @return [String] the given label
+ * @raise [ArgumentError] if the label names a file with '@'
  */
 VALUE Info_label_eq(VALUE self, VALUE string)
 {

data/ext/RMagick/rmkinfo.cpp

@@ -82,14 +82,28 @@ KernelInfo_alloc(VALUE klass)
 /**
  * KernelInfo object constructor
  *
+ * - Calling it again on an initialized object replaces its kernel and destroys the old one.
+ * - A kernel string whose first non-blank character is '@' is rejected: ImageMagick would read the
+ *   kernel from the file it names. A string that contains a %[fx:@...], %[hex:@...] or
+ *   %[pixel:@...] escape is rejected as well, by the same check as the other options that name files.
+ *
  * @param kernel_string [String] kernel info string representation to be parsed
  * @return [Magick::KernelInfo] self
+ * @raise [FrozenError] if the object is frozen
+ * @raise [ArgumentError] if the kernel string names a file with '@'
  */
 VALUE
 KernelInfo_initialize(VALUE self, VALUE kernel_string)
 {
-    KernelInfo *kernel;
-    char *string = StringValueCStr(kernel_string);
+    KernelInfo *kernel, *old_kernel;
+    char *string;
+
+    rb_check_frozen(self);
+    string = StringValueCStr(kernel_string);
+    if (rm_has_file_reference(string))
+    {
+        rb_raise(rb_eArgError, "the kernel must not name a file with '@'");
+    }
 
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
@@ -113,7 +127,12 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
         rb_raise(rb_eRuntimeError, "failed to parse kernel string");
     }
 
+    old_kernel = (KernelInfo *)DATA_PTR(self);
     DATA_PTR(self) = kernel;
+    if (old_kernel)
+    {
+        DestroyKernelInfo(old_kernel);
+    }
 
     return self;
 }
@@ -145,6 +164,24 @@ get_kernel_info(VALUE self)
 }
 
 
+/**
+ * Return the KernelInfo struct of an object that is about to be changed,
+ * raising FrozenError if the object is frozen.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param self the KernelInfo object
+ * @return the KernelInfo struct
+ * @throw FrozenError if the object is frozen
+ */
+static KernelInfo *
+get_unfrozen_kernel_info(VALUE self)
+{
+    rb_check_frozen(self);
+    return get_kernel_info(self);
+}
+
+
 /**
  * Adds a given amount of the 'Unity' Convolution Kernel to the given pre-scaled and normalized Kernel.
  *
@@ -153,7 +190,7 @@ get_kernel_info(VALUE self)
 VALUE
 KernelInfo_unity_add(VALUE self, VALUE scale)
 {
-    GVL_STRUCT_TYPE(UnityAddKernelInfo) args = { get_kernel_info(self), NUM2DBL(scale) };
+    GVL_STRUCT_TYPE(UnityAddKernelInfo) args = { get_unfrozen_kernel_info(self), NUM2DBL(scale) };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(UnityAddKernelInfo), &args);
     return Qnil;
 }
@@ -164,8 +201,10 @@ KernelInfo_unity_add(VALUE self, VALUE scale)
  * of the sum of the kernel values (as per given flags).
  *
  * @param scale [Numeric] scale to use
- * @param flags [Magick::GeometryFlags] one of Magick::NormalizeValue, Magick::CorrelateNormalizeValue,
- *   and/or Magick::PercentValue
+ * @param flags [Magick::GeometryFlags] Magick::NoValue, Magick::NormalizeValue or
+ *   Magick::CorrelateNormalizeValue. ScaleKernelInfo ignores the other values, including
+ *   Magick::PercentValue; use {KernelInfo#scale_geometry} for a percentage.
+ * @return [nil]
  */
 VALUE
 KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
@@ -174,7 +213,7 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 
     VALUE_TO_ENUM(flags, geoflags, GeometryFlags);
 
-    GVL_STRUCT_TYPE(ScaleKernelInfo) args = { get_kernel_info(self), NUM2DBL(scale), geoflags };
+    GVL_STRUCT_TYPE(ScaleKernelInfo) args = { get_unfrozen_kernel_info(self), NUM2DBL(scale), geoflags };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleKernelInfo), &args);
     return Qnil;
 }
@@ -190,7 +229,7 @@ KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 {
     char *geom = StringValueCStr(geometry);
 
-    GVL_STRUCT_TYPE(ScaleGeometryKernelInfo) args = { get_kernel_info(self), geom };
+    GVL_STRUCT_TYPE(ScaleGeometryKernelInfo) args = { get_unfrozen_kernel_info(self), geom };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleGeometryKernelInfo), &args);
 
     RB_GC_GUARD(geometry);
@@ -199,19 +238,32 @@ KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 }
 
 /**
- * Creates a new clone of the object so that it can be modified without affecting the original.
+ * Initialize a copy made by clone or dup with a copy of the kernel of the original.
  *
- * @return [Magick::KernelInfo] new KernelInfo object
+ * @param orig the original object
+ * @return [Magick::KernelInfo] self
+ * @raise [FrozenError] if the object is frozen
  */
 VALUE
-KernelInfo_clone(VALUE self)
+KernelInfo_init_copy(VALUE self, VALUE orig)
 {
-    KernelInfo *kernel = CloneKernelInfo(get_kernel_info(self));
+    KernelInfo *kernel, *old_kernel;
+
+    rb_check_frozen(self);
+    kernel = CloneKernelInfo(get_kernel_info(orig));
     if (!kernel)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
-    return TypedData_Wrap_Struct(Class_KernelInfo, &rm_kernel_info_data_type, kernel);
+
+    old_kernel = (KernelInfo *)DATA_PTR(self);
+    DATA_PTR(self) = kernel;
+    if (old_kernel)
+    {
+        DestroyKernelInfo(old_kernel);
+    }
+
+    return self;
 }
 
 /**
@@ -219,6 +271,9 @@ KernelInfo_clone(VALUE self)
  * kernels used for special purposes such as gaussian blurring, skeleton
  * pruning, and edge distance determination.
  *
+ * - The kernel is parsed from "name:geometry" as KernelInfo.new does, so the
+ *   arguments that are left out get ImageMagick's defaults.
+ *
  * @param what [Magick::KernelInfoType] kernel one of Magick::KernelInfoType enums
  * @param geometry [String] geometry to pass to default kernel
  * @return [Magick::KernelInfo] a new KernelInfo object
@@ -229,21 +284,32 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
     KernelInfo *kernel;
     KernelInfoType kernel_type;
     GeometryInfo info;
-    const char *geom_str;
+    const char *geom_str, *name;
+    char kernel_string[MaxTextExtent];
+    int length;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
 
     VALUE_TO_ENUM(what, kernel_type, KernelInfoType);
     geom_str = StringValueCStr(geometry);
-    if (ParseGeometry(geom_str, &info) == NoValue && *geom_str)
+    // AcquireKernelInfo() reads a list of kernels separated by ';'. ParseGeometry() rejects such a
+    // string today, but builtin makes one built-in kernel, so reject ';' explicitly as well.
+    if ((ParseGeometry(geom_str, &info) == NoValue && *geom_str) || strchr(geom_str, ';'))
     {
         rb_raise(rb_eArgError, "invalid geometry string");
     }
 
+    name = CommandOptionToMnemonic(MagickKernelOptions, kernel_type);
+    length = snprintf(kernel_string, sizeof(kernel_string), "%s:%s", name, geom_str);
+    if (length < 0 || (size_t)length >= sizeof(kernel_string))
+    {
+        rb_raise(rb_eArgError, "geometry string too long");
+    }
+
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    kernel = AcquireKernelBuiltIn(kernel_type, &info, exception);
+    kernel = AcquireKernelInfo(kernel_string, exception);
     if (rm_should_raise_exception(exception, DestroyExceptionRetention))
     {
         if (kernel != (KernelInfo *) NULL)
@@ -253,9 +319,11 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
         rm_raise_exception(exception);
     }
 #else
-    kernel = AcquireKernelBuiltIn(kernel_type, &info);
+    kernel = AcquireKernelInfo(kernel_string);
 #endif
 
+    RB_GC_GUARD(geometry);
+
     if (!kernel)
     {
         rb_raise(rb_eRuntimeError, "failed to acquire builtin kernel");

data/ext/RMagick/rmmain.cpp

@@ -267,6 +267,7 @@ Init_RMagick2(void)
     rb_define_module_function(Module_Magick, "fonts", RUBY_METHOD_FUNC(Magick_fonts), 0);
     rb_define_module_function(Module_Magick, "init_formats", RUBY_METHOD_FUNC(Magick_init_formats), 0);
     rb_define_module_function(Module_Magick, "limit_resource", RUBY_METHOD_FUNC(Magick_limit_resource), -1);
+    rb_define_module_function(Module_Magick, "resource_usage", RUBY_METHOD_FUNC(Magick_resource_usage), 1);
     rb_define_module_function(Module_Magick, "set_cache_threshold", RUBY_METHOD_FUNC(Magick_set_cache_threshold), 1);
     rb_define_module_function(Module_Magick, "set_log_event_mask", RUBY_METHOD_FUNC(Magick_set_log_event_mask), -1);
     rb_define_module_function(Module_Magick, "set_log_format", RUBY_METHOD_FUNC(Magick_set_log_format), 1);
@@ -436,7 +437,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "charcoal", RUBY_METHOD_FUNC(Image_charcoal), -1);
     rb_define_method(Class_Image, "chop", RUBY_METHOD_FUNC(Image_chop), 4);
     rb_define_method(Class_Image, "clut_channel", RUBY_METHOD_FUNC(Image_clut_channel), -1);
-    rb_define_method(Class_Image, "clone", RUBY_METHOD_FUNC(Image_clone), 0);
     rb_define_method(Class_Image, "color_flood_fill", RUBY_METHOD_FUNC(Image_color_flood_fill), 5);
     rb_define_method(Class_Image, "color_histogram", RUBY_METHOD_FUNC(Image_color_histogram), 0);
     rb_define_method(Class_Image, "colorize", RUBY_METHOD_FUNC(Image_colorize), -1);
@@ -476,7 +476,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "distort", RUBY_METHOD_FUNC(Image_distort), -1);
     rb_define_method(Class_Image, "distortion_channel", RUBY_METHOD_FUNC(Image_distortion_channel), -1);
     rb_define_method(Class_Image, "_dump", RUBY_METHOD_FUNC(Image__dump), 1);
-    rb_define_method(Class_Image, "dup", RUBY_METHOD_FUNC(Image_dup), 0);
     rb_define_method(Class_Image, "each_profile", RUBY_METHOD_FUNC(Image_each_profile), 0);
     rb_define_method(Class_Image, "edge", RUBY_METHOD_FUNC(Image_edge), -1);
     rb_define_method(Class_Image, "emboss", RUBY_METHOD_FUNC(Image_emboss), -1);
@@ -678,10 +677,8 @@ Init_RMagick2(void)
     rb_include_module(Class_Draw, Module_DrawAttribute);
 
     rb_define_method(Class_Draw, "annotate", RUBY_METHOD_FUNC(Draw_annotate), 6);
-    rb_define_method(Class_Draw, "clone", RUBY_METHOD_FUNC(Draw_clone), 0);
     rb_define_method(Class_Draw, "composite", RUBY_METHOD_FUNC(Draw_composite), -1);
     rb_define_method(Class_Draw, "draw", RUBY_METHOD_FUNC(Draw_draw), 1);
-    rb_define_method(Class_Draw, "dup", RUBY_METHOD_FUNC(Draw_dup), 0);
     rb_define_method(Class_Draw, "get_type_metrics", RUBY_METHOD_FUNC(Draw_get_type_metrics), -1);
     rb_define_method(Class_Draw, "get_multiline_type_metrics", RUBY_METHOD_FUNC(Draw_get_multiline_type_metrics), -1);
     rb_define_method(Class_Draw, "initialize", RUBY_METHOD_FUNC(Draw_initialize), 0);
@@ -747,8 +744,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Pixel, "eql?", RUBY_METHOD_FUNC(Pixel_eql_q), 1);
     rb_define_method(Class_Pixel, "initialize", RUBY_METHOD_FUNC(Pixel_initialize), -1);
     rb_define_method(Class_Pixel, "initialize_copy", RUBY_METHOD_FUNC(Pixel_init_copy), 1);
-    rb_define_method(Class_Pixel, "clone", RUBY_METHOD_FUNC(Pixel_clone), 0);
-    rb_define_method(Class_Pixel, "dup", RUBY_METHOD_FUNC(Pixel_dup), 0);
     rb_define_method(Class_Pixel, "fcmp", RUBY_METHOD_FUNC(Pixel_fcmp), -1);
     rb_define_method(Class_Pixel, "hash", RUBY_METHOD_FUNC(Pixel_hash), 0);
     rb_define_method(Class_Pixel, "intensity", RUBY_METHOD_FUNC(Pixel_intensity), 0);
@@ -907,8 +902,7 @@ Init_RMagick2(void)
     rb_define_method(Class_KernelInfo, "unity_add", RUBY_METHOD_FUNC(KernelInfo_unity_add), 1);
     rb_define_method(Class_KernelInfo, "scale", RUBY_METHOD_FUNC(KernelInfo_scale), 2);
     rb_define_method(Class_KernelInfo, "scale_geometry", RUBY_METHOD_FUNC(KernelInfo_scale_geometry), 1);
-    rb_define_method(Class_KernelInfo, "clone", RUBY_METHOD_FUNC(KernelInfo_clone), 0);
-    rb_define_method(Class_KernelInfo, "dup", RUBY_METHOD_FUNC(KernelInfo_clone), 0);
+    rb_define_method(Class_KernelInfo, "initialize_copy", RUBY_METHOD_FUNC(KernelInfo_init_copy), 1);
 
     rb_define_singleton_method(Class_KernelInfo, "builtin", RUBY_METHOD_FUNC(KernelInfo_builtin), 2);
 

data/ext/RMagick/rmmontage.cpp

@@ -442,18 +442,29 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
 
 
 /**
- * Set title value.
+ * Set title value. A title whose first non-blank character is '@', or that contains a
+ * %[fx:@...], %[hex:@...] or %[pixel:@...] escape, is rejected because ImageMagick reads the
+ * file it names.
  *
  * @param title [String] the title
  * @return [String] the given title
+ * @raise [ArgumentError] if the title names a file with '@'
  */
 VALUE
 Montage_title_eq(VALUE self, VALUE title)
 {
     Montage *montage;
+    const char *title_cstr;
 
     TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
-    magick_clone_string(&montage->info->title, StringValueCStr(title));
+    title_cstr = StringValueCStr(title);
+
+    if (rm_has_file_reference(title_cstr))
+    {
+        rb_raise(rb_eArgError, "the title must not name a file with '@'");
+    }
+
+    magick_clone_string(&montage->info->title, title_cstr);
     return title;
 }
 

data/ext/RMagick/rmpixel.cpp

@@ -531,50 +531,8 @@ Pixel_case_eq(VALUE self, VALUE other)
 }
 
 
-/**
- * Clone a Pixel.
- *
- * @return [Magick::Pixel] a clone object
- * @see #dup
- * @see #initialize_copy
- */
-VALUE
-Pixel_clone(VALUE self)
-{
-    VALUE clone;
-
-    clone = Pixel_dup(self);
-    if (OBJ_FROZEN(self))
-    {
-        OBJ_FREEZE(clone);
-    }
-
-    RB_GC_GUARD(clone);
-
-    return clone;
-}
 
 
-/**
- * Duplicate a Pixel.
- *
- * @return [Magick::Pixel] a duplicated object
- * @see #clone
- * @see #initialize_copy
- */
-VALUE
-Pixel_dup(VALUE self)
-{
-    Pixel *pixel;
-    VALUE dup;
-
-    pixel = ALLOC(Pixel);
-    memset(pixel, '\0', sizeof(Pixel));
-    dup = TypedData_Wrap_Struct(CLASS_OF(self), &rm_pixel_data_type, pixel);
-    RB_GC_GUARD(dup);
-
-    return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
-}
 
 
 /**

data/ext/RMagick/rmstruct.cpp

@@ -838,7 +838,7 @@ Import_TypeMetric(TypeMetric *tm)
     max_advance         = rb_float_new(tm->max_advance);
     bounds              = Import_SegmentInfo(&tm->bounds);
     underline_position  = rb_float_new(tm->underline_position);
-    underline_thickness = rb_float_new(tm->underline_position);
+    underline_thickness = rb_float_new(tm->underline_thickness);
 
     RB_GC_GUARD(pixels_per_em);
     RB_GC_GUARD(ascent);

data/ext/RMagick/rmutil.cpp

@@ -221,6 +221,50 @@ rm_strnlen_s(const char *str, size_t strsz)
 }
 
 
+/**
+ * Return true if InterpretImageProperties() would read a file the string names, that is, if its
+ * first non-blank character is '@', or if it contains a %[fx:...], %[hex:...] or %[pixel:...]
+ * escape whose expression begins with '@'.
+ *
+ * ImageMagick 7 reads such an expression from the file it names, with no blank skipped before
+ * the '@'. It also interprets a %[...] inside an fx expression, even after "%%" since '%' is the
+ * modulo operator there, so every "%[" in the string is checked. The prefixes are compared with
+ * LocaleNCompare() as ImageMagick does. ImageMagick 6 does not read these expressions, but the
+ * check is the same for both.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param str the string
+ * @return true if the string names a file to read, otherwise false
+ */
+bool
+rm_has_file_reference(const char *str)
+{
+    const char *p;
+
+    p = str;
+    while (isspace((int) ((unsigned char) *p)))
+    {
+        p++;
+    }
+    if (*p == '@')
+    {
+        return true;
+    }
+
+    for (p = strstr(str, "%["); p != NULL; p = strstr(p + 2, "%["))
+    {
+        if (LocaleNCompare(p + 2, "fx:@", 4) == 0
+            || LocaleNCompare(p + 2, "hex:@", 5) == 0
+            || LocaleNCompare(p + 2, "pixel:@", 7) == 0)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+
 /**
  * Raise exception if array too short.
  *

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '7.1.4'
+  VERSION = '7.1.6'
   MIN_RUBY_VERSION = '3.2.0'
   MIN_IM6_VERSION = '6.9.0'
   MIN_IM7_VERSION = '7.1.0'

data/lib/rmagick_internal.rb

@@ -1410,12 +1410,6 @@ module Magick
       @images.clear
     end
 
-    def clone
-      ditto = dup
-      ditto.freeze if frozen?
-      ditto
-    end
-
     # override Enumerable#collect
     def collect(&)
       current = get_current
@@ -1507,13 +1501,6 @@ module Magick
       self
     end
 
-    def dup
-      ditto = self.class.new
-      @images.each { |img| ditto << img }
-      ditto.scene = @scene
-      ditto
-    end
-
     def eql?(other)
       begin
         assert_image_array other
@@ -1570,6 +1557,13 @@ module Magick
       @scene = length - 1 if length > 0 # last image in array
     end
 
+    # Called by clone and dup, after the instance variables are copied. The copy
+    # has its own array of the same images.
+    def initialize_copy(other)
+      super
+      @images = @images.dup
+    end
+
     def insert(index, *args)
       args.each { |image| assert_image image }
       current = get_current