rmagick 7.0.5 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a209cf0d468a316b82b18e0dc8cdfe37d07e3a9a89a54750303c48fddbc4721
-  data.tar.gz: ec494eed858ad482b7fbc1a3784c471bed373ab2ad1cd3835c99b3c998548736
+  metadata.gz: 5ee430e845ae8794dc88e1af56d944fe511321c91eaabdda600810127f522c5e
+  data.tar.gz: b8705aec273d52d277bf4f73caeb00c78befdf803426eb14fedc3ddf0028399a
 SHA512:
-  metadata.gz: 8879e76297539f5ab7816fb3ba4894530141292fdd828277774d5631655176c717f0888f4624d22f6b7006e9d1b544f7065705220d06df77eadbb428216d6dce
-  data.tar.gz: 67e8ff6082884e98cf7cf3dfc35eee092377fc2e4a1d60cc6679b9872dc4c52effc6a6ad6b95966a552eb6f15c2b0264ee2580d768dfce0b71a9aa1ee90b866a
+  metadata.gz: 48bc5436488b2b05f990e645ab294674b6d176dc584010686098b03b51cae5d67564b47d3ad5532a9001026027c1fb316f6b9b07fd7284c1825b82c5d084c365
+  data.tar.gz: 1a389dc68b01846feb575c5dcc3b42988baf99bfef0c03e7231db3d013973e1a74440dac99980295baa72efe5e1d01733a236854b43b6770aa461d7a6ed7e2e0

data/CHANGELOG.md

@@ -3,6 +3,51 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.1.1
+
+Bug Fixes
+
+* Fix Strings being recycled while the C pointers into them are in use (#1847)
+
+## RMagick 7.1.0
+
+> [!IMPORTANT]
+> `Draw#annotate` and `Draw#get_type_metrics` no longer interpret the text they are given.
+> A `%[...]` or `%x` escape in it is now drawn as written instead of being replaced by an image property.
+> Everything those escapes provided is available directly from Ruby -- `Image#columns`, `Image#rows`, `Image#format`, `Image#filesize`, `Image#filename`, `Image#[]`, `Image#artifact`, `Image#channel_mean`, `Image#pixel_color` and `Image#fx` -- so build the string in Ruby and pass the result.
+>
+> The interpolation was undocumented, and it handed any caller that passed user-supplied text an expression evaluator, a pixel and metadata reader, and an unbounded CPU sink. It also corrupted ordinary captions: `"%d items"` was drawn as the directory the image had been read from.
+
+Breaking Changes
+
+* Draw annotation text as given instead of interpreting it (#1843)
+* Draw text starting with '@' instead of reading it from that file (#1837)
+* Validate RVG path data against the SVG path grammar (#1839)
+* Escape values and quote the clip-path and encoding names in the MVG program (#1841)
+* Reject embedded NUL bytes in pathname arguments (#1827)
+
+Improvements
+
+* Add Image#artifact to read the artifacts Image#define writes (#1842)
+* Fix grammar, typos, and content errors in the documentation (#1824)
+
+Bug Fixes
+
+* Fix RVG text being quoted twice and the added quotes being drawn (#1840)
+* Fix MVG injection in Draw#text from unescaped backslashes (#1838)
+* Fix memory leak in ImageList#composite_layers with an unusable source list (#1836)
+* Fix heap over-read in Image#import_pixels with a long or empty map (#1835)
+* Fix SEGV from integer overflow in Image#import_pixels geometry (#1834)
+* Fix heap over-read in Image#recolor (#1833)
+* Fix SEGV in Draw#marshal_load with a non-String pattern (#1832)
+* Fix use-after-free of cloned images in images_from_imagelist() (#1831)
+* Fix double free of the interpreted text in Draw#get_type_metrics (#1830)
+* Fix double free of the annotation text in Draw#annotate (#1829)
+* Fix SEGV in Info#stroke_width= and Info#attenuate= with a large Float (#1828)
+* Fix Magick#set_log_event_mask() (#1826)
+* Fix copy_options() using the option value as the artifact key (#1823)
+* Fix unchecked SetImageArtifact() calls (#1822)
+
 ## RMagick 7.0.5
 
 Bug Fixes

data/Rakefile

@@ -188,6 +188,12 @@ end
 if RUBY_PLATFORM.include?('linux')
   require 'ruby_memcheck'
   require 'ruby_memcheck/rspec/rake_task'
+
+  RubyMemcheck.config(
+    binary_name: 'RMagick2',
+    valgrind_suppressions_dir: 'spec/valgrind'
+  )
+
   namespace :spec do
     RubyMemcheck::RSpec::RakeTask.new(valgrind: :compile)
   end

data/ext/RMagick/extconf.rb

@@ -123,7 +123,7 @@ module RMagick
         $LDFLAGS    += " #{ldflags} #{rpath}"
 
         unless try_link("int main() { }")
-          # if linker does not recognizes '-Wl,-rpath,somewhere' option, it revert to original option
+          # if linker does not recognize '-Wl,-rpath,somewhere' option, it reverts to original option
           $LDFLAGS = "#{original_ldflags} #{ldflags}"
         end
       end
@@ -344,7 +344,7 @@ module RMagick
     end
 
     def print_summary
-      summary = <<~"END_SUMMARY"
+      summary = <<~END_SUMMARY
         #{'=' * 70}
         #{Time.now.strftime('%a %d %b %y %T')}
         This installation of RMagick #{RMAGICK_VERS} is configured for

data/ext/RMagick/rmagick.cpp

@@ -312,7 +312,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 
 /**
  * Set the amount of free memory allocated for the pixel cache.  Once this
- * threshold is exceeded, all subsequent pixels cache operations are to/from
+ * threshold is exceeded, all subsequent pixel cache operations are to/from
  * disk.
  *
  * @param threshold [Numeric] the number of megabytes to set.
@@ -346,23 +346,45 @@ Magick_set_cache_threshold(VALUE klass, VALUE threshold)
  * - "user"
  * - "x11"
  *
- * Multiple events can be specified as the aruments. Event names may be capitalized.
+ * Multiple events can be specified as the arguments. Event names may be capitalized.
  *
- * @param args [String] the mask of log event.
+ * @param args [Array<String>] one or more log event types (comma-separated lists and/or multiple arguments).
+ * @raise [ArgumentError] if an event name is invalid
  */
 VALUE
 Magick_set_log_event_mask(int argc, VALUE *argv, VALUE klass)
 {
+    VALUE events;
     int x;
 
     if (argc == 0)
     {
         rb_raise(rb_eArgError, "wrong number of arguments (at least 1 required)");
     }
+
+    // SetLogEventMask() does not provide a way to check if it failed
+    // since it returns the old mask.
     for (x = 0; x < argc; x++)
     {
-        SetLogEventMask(StringValueCStr(argv[x]));
+        const char *event = StringValueCStr(argv[x]);
+        if (ParseCommandOption(MagickLogEventOptions, MagickTrue, event) == -1)
+        {
+            rb_raise(rb_eArgError, "invalid log event type: %s", event);
+        }
+    }
+
+    // SetLogEventMask() replaces the mask on each call rather than adding to it,
+    // so multiple events must be passed as a single comma-separated list.
+    events = rb_str_dup(argv[0]);
+    for (x = 1; x < argc; x++)
+    {
+        rb_str_cat_cstr(events, ",");
+        rb_str_append(events, argv[x]);
     }
+    SetLogEventMask(StringValueCStr(events));
+
+    RB_GC_GUARD(events);
+
     return klass;
 }
 

data/ext/RMagick/rmagick.h

@@ -108,10 +108,10 @@ extern "C" {
 #define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quantum <- Ruby Numeric conversion */
 #elif (MAGICKCORE_QUANTUM_DEPTH == 32)
 #define QUANTUM2NUM(q) UINT2NUM((q)) /**< Quantum -> Ruby Numeric conversion */
-#define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quntum <- Ruby Numeric conversion */
+#define NUM2QUANTUM(n) (Quantum)NUM2UINT((n)) /**< Quantum <- Ruby Numeric conversion */
 #elif (MAGICKCORE_QUANTUM_DEPTH == 64)
 #define QUANTUM2NUM(q) ULL2NUM((q)) /**< Quantum -> Ruby Numeric conversion */
-#define NUM2QUANTUM(n) (Quantum)NUM2ULL((n)) /**< Quntum <- Ruby Numeric conversion */
+#define NUM2QUANTUM(n) (Quantum)NUM2ULL((n)) /**< Quantum <- Ruby Numeric conversion */
 #else
 #error Specified MAGICKCORE_QUANTUM_DEPTH is not supported.
 #endif
@@ -247,7 +247,7 @@ typedef enum {
 //! Draw#text_anchor AnchorType argument
 typedef enum {
     StartAnchor = 1,  /**< start */
-    MiddleAnchor = 2, /**< midle */
+    MiddleAnchor = 2, /**< middle */
     EndAnchor = 3     /**< end */
 } AnchorType;
 
@@ -813,6 +813,7 @@ extern VALUE Image_affine_transform(VALUE, VALUE);
 extern VALUE Image_alpha(int, VALUE *, VALUE);
 extern VALUE Image_alpha_q(VALUE);
 extern VALUE Image_aref(VALUE, VALUE);
+extern VALUE Image_artifact(VALUE, VALUE);
 extern VALUE Image_aset(VALUE, VALUE, VALUE);
 extern VALUE Image_auto_gamma_channel(int, VALUE *, VALUE);
 extern VALUE Image_auto_level_channel(int, VALUE *, VALUE);
@@ -1162,7 +1163,8 @@ extern void   rm_check_ary_len(VALUE, long);
 extern VALUE  rm_check_ary_type(VALUE ary);
 extern Image *rm_check_destroyed(VALUE);
 extern Image *rm_check_frozen(VALUE);
-extern char  *rm_str2cstr(VALUE, size_t *);
+extern char  *rm_str2cstr(VALUE *, size_t *);
+extern char  *rm_path2cstr(VALUE *, size_t *);
 extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
 extern Quantum rm_app2quantum(VALUE);

data/ext/RMagick/rmdraw.cpp

@@ -500,6 +500,8 @@ Image *str_to_image(VALUE str)
         Info *info;
         ExceptionInfo *exception;
 
+        StringValue(str);
+
         info = CloneImageInfo(NULL);
         exception = AcquireExceptionInfo();
         GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(str), (size_t)RSTRING_LEN(str), exception };
@@ -509,6 +511,8 @@ Image *str_to_image(VALUE str)
         DestroyExceptionInfo(exception);
     }
 
+    RB_GC_GUARD(str);
+
     return image;
 }
 
@@ -836,7 +840,7 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
  * Annotates an image with text.
  *
  * - Additional Draw attribute methods may be called in the optional block,
- *   which is executed in the context of an Draw object.
+ *   which is executed in the context of a Draw object.
  *
  * @param image_arg [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *   imagelist, uses the current image.
@@ -882,29 +886,15 @@ VALUE Draw_annotate(
         rb_yield(self);
     }
 
-    // Translate & store in Draw structure
+    // Store in Draw structure. The text is drawn as given: it is not run
+    // through InterpretImageProperties(), so a `%[...]` or `%x` escape in it is
+    // not expanded. Everything those escapes provide is available directly from
+    // Ruby -- Image#columns, Image#filename, Image#artifact and so on.
     embed_text = StringValueCStr(text);
+    draw->info->text = ConstantString(embed_text);
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    draw->info->text = InterpretImageProperties(NULL, image, embed_text, exception);
-    if (rm_should_raise_exception(exception, RetainExceptionRetention))
-    {
-        if (draw->info->text)
-        {
-            magick_free(draw->info->text);
-        }
-        rm_raise_exception(exception);
-    }
-#else
-    draw->info->text = InterpretImageProperties(NULL, image, embed_text);
 #endif
-    if (!draw->info->text)
-    {
-#if defined(IMAGEMAGICK_7)
-        DestroyExceptionInfo(exception);
-#endif
-        rb_raise(rb_eArgError, "no text");
-    }
 
     // Create geometry string, copy to Draw structure, overriding
     // any previously existing value.
@@ -1147,7 +1137,7 @@ Draw_dup(VALUE self)
  *     imagelist, uses the current image.
  *   @param text [String] The string to be rendered.
  *
- * @return [Magick::TypeMetric] The information for a specific string if rendered on a image.
+ * @return [Magick::TypeMetric] The information for a specific string if rendered on an image.
  */
 VALUE
 Draw_get_type_metrics(
@@ -1174,7 +1164,7 @@ Draw_get_type_metrics(
  *     imagelist, uses the current image.
  *   @param text [String] The string to be rendered.
  *
- * @return [Magick::TypeMetric] The information for a specific string if rendered on a image.
+ * @return [Magick::TypeMetric] The information for a specific string if rendered on an image.
  */
 VALUE
 Draw_get_multiline_type_metrics(
@@ -1340,7 +1330,7 @@ Draw_mark(void *drawptr)
 
 
 /**
- * Free the memory associated with an Draw object.
+ * Free the memory associated with a Draw object.
  *
  * No Ruby usage (internal function)
  *
@@ -1401,7 +1391,7 @@ new_DrawOptions(void)
 /**
  * Create a DrawOptions object.
  *
- * - The DrawOptions class is the same as the Draw class except is has only
+ * - The DrawOptions class is the same as the Draw class except it has only
  *   the attribute writer functions
  *
  * @return [Magick::Image::DrawOptions] a new DrawOptions object
@@ -1629,6 +1619,7 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
     Image *image;
     Draw *draw;
     VALUE t;
+    VALUE text_arg = Qnil;
     TypeMetric metrics;
     char *text = NULL;
     size_t text_l;
@@ -1640,13 +1631,15 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
     switch (argc)
     {
         case 1:                   // use default image
-            text = rm_str2cstr(argv[0], &text_l);
+            text_arg = argv[0];
+            text = rm_str2cstr(&text_arg, &text_l);
             TypedData_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, &rm_image_data_type, image);
             break;
         case 2:
             t = rm_cur_image(argv[0]);
             image = rm_check_destroyed(t);
-            text = rm_str2cstr(argv[1], &text_l);
+            text_arg = argv[1];
+            text = rm_str2cstr(&text_arg, &text_l);
             break;                  // okay
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
@@ -1659,29 +1652,11 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
     }
 
     draw = get_draw(self);
-#if defined(IMAGEMAGICK_7)
-    exception = AcquireExceptionInfo();
-    draw->info->text = InterpretImageProperties(NULL, image, text, exception);
-    if (rm_should_raise_exception(exception, RetainExceptionRetention))
-    {
-        if (draw->info->text)
-        {
-            magick_free(draw->info->text);
-        }
-        rm_raise_exception(exception);
-    }
-#else
-    draw->info->text = InterpretImageProperties(NULL, image, text);
-#endif
-    if (!draw->info->text)
-    {
-#if defined(IMAGEMAGICK_7)
-        DestroyExceptionInfo(exception);
-#endif
-        rb_raise(rb_eArgError, "no text to measure");
-    }
+    // Measured as given: see the comment in Draw_annotate().
+    draw->info->text = ConstantString(text);
 
 #if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics, exception };
 #else
     GVL_STRUCT_TYPE(get_type_metrics) args = { image, draw->info, &metrics };
@@ -1710,6 +1685,7 @@ get_type_metrics(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
 #endif
 
     RB_GC_GUARD(t);
+    RB_GC_GUARD(text_arg);
 
     return Import_TypeMetric(&metrics);
 }

data/ext/RMagick/rmenum.cpp

@@ -219,7 +219,7 @@ Enum_spaceship(VALUE self, VALUE other)
 /**
  * Bitwise OR for enums
  *
- * @param another [Magick::Enum] the another enum
+ * @param another [Magick::Enum] the other enum
  * @return [Magick::Enum] new Enum instance
  */
 VALUE
@@ -361,7 +361,7 @@ Enum_type_values(VALUE klass)
  *
  * @param klass the class type
  * @param value the value for enum
- * @return a enumerator
+ * @return an enumerator
  */
 
 VALUE
@@ -541,7 +541,7 @@ CompressionType_find(CompressionType ct)
 
 
 /**
- * Returns a DisposeType enum object for the specified value..new.
+ * Returns a DisposeType enum object for the specified value.
  *
  * No Ruby usage (internal function)
  *
@@ -661,7 +661,7 @@ PixelInterpolateMethod_find(PixelInterpolateMethod interpolate)
 
 
 /**
- * Construct an RenderingIntent enum object for the specified value.
+ * Construct a RenderingIntent enum object for the specified value.
  *
  * No Ruby usage (internal function)
  *
@@ -785,7 +785,7 @@ StyleType_find(StyleType style)
  *
  * No Ruby usage (internal function)
  *
- * @param style theVirtualPixelMethod
+ * @param style the VirtualPixelMethod
  * @return a new VirtualPixelMethod enumerator
  */
 VALUE