rmagick 7.1.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee430e845ae8794dc88e1af56d944fe511321c91eaabdda600810127f522c5e
-  data.tar.gz: b8705aec273d52d277bf4f73caeb00c78befdf803426eb14fedc3ddf0028399a
+  metadata.gz: a64e970fa95ffd136462c610a760685197a4ed3ceb2c9e6dad90be7a0c8f3211
+  data.tar.gz: dc300b78b89fdb54386fbc10e14b55f6dd37497e65923ec48728abe3b3c85b1d
 SHA512:
-  metadata.gz: 48bc5436488b2b05f990e645ab294674b6d176dc584010686098b03b51cae5d67564b47d3ad5532a9001026027c1fb316f6b9b07fd7284c1825b82c5d084c365
-  data.tar.gz: 1a389dc68b01846feb575c5dcc3b42988baf99bfef0c03e7231db3d013973e1a74440dac99980295baa72efe5e1d01733a236854b43b6770aa461d7a6ed7e2e0
+  metadata.gz: f9ae77c69984d7472435ccfceda7c74637a4b2374e6529d40d47dae464629058a778c76208f7ca9c1644ecc2e50a44ca507abcd265fb57cff22c83fc7f031cf5
+  data.tar.gz: 3d620912beddcea78dc6953c461281f35bf5ea1c9d68c3cfe0c8a25c60cefc79f36c4834c559d59f448e1d749956755148425bd421a8f20e17859fd24f867e8f

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.1.2
+
+Bug Fixes
+
+* Fix memory leak in Draw#annotate when the geometry copy fails (#1854)
+* Fix affine matrix not being restored when Draw#annotate raises (#1853)
+* Fix use-after-free in Draw#annotate when a callback destroys the image (#1852)
+* Fix memory leak in Draw#annotate when a geometry argument raises (#1850)
+
 ## RMagick 7.1.1
 
 Bug Fixes

data/Rakefile

@@ -195,7 +195,9 @@ if RUBY_PLATFORM.include?('linux')
   )
 
   namespace :spec do
-    RubyMemcheck::RSpec::RakeTask.new(valgrind: :compile)
+    RubyMemcheck::RSpec::RakeTask.new(valgrind: :compile) do |t|
+      t.rspec_opts = '--tag "~slow"' unless ENV['SLOW']
+    end
   end
 end
 

data/ext/RMagick/rmdraw.cpp

@@ -836,72 +836,88 @@ Draw_undercolor_eq(VALUE self, VALUE undercolor)
 }
 
 
+struct Draw_annotate_args
+{
+    VALUE self;
+    VALUE image_arg;
+    VALUE width_arg;
+    VALUE height_arg;
+    VALUE x_arg;
+    VALUE y_arg;
+    VALUE text;
+    Draw *draw;
+    AffineMatrix keep;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
+};
+
+
 /**
- * Annotates an image with text.
+ * Release what annotate_body acquired and restore the affine matrix.
  *
- * - Additional Draw attribute methods may be called in the optional block,
- *   which is executed in the context of a Draw object.
+ * No Ruby usage (internal function)
  *
- * @param image_arg [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
- *   imagelist, uses the current image.
- * @param width_arg [Numeric] the width
- * @param height_arg [Numeric] the height
- * @param x_arg [Numeric] x position
- * @param y_arg [Numeric] y position
- * @param text [String] the annotation text
- * @return [Magick::Draw] self
+ * @param arg the annotate arguments
+ * @return nil
+ * @see Draw_annotate
  */
-VALUE Draw_annotate(
-                   VALUE self,
-                   VALUE image_arg,
-                   VALUE width_arg,
-                   VALUE height_arg,
-                   VALUE x_arg,
-                   VALUE y_arg,
-                   VALUE text)
+static VALUE
+annotate_ensure(VALUE arg)
 {
-    Draw *draw;
+    struct Draw_annotate_args *annotate = (struct Draw_annotate_args *)arg;
+    Draw *draw = annotate->draw;
+
+    magick_free(draw->info->text);
+    draw->info->text = NULL;
+    draw->info->affine = annotate->keep;
+
+#if defined(IMAGEMAGICK_7)
+    if (annotate->exception)
+    {
+        DestroyExceptionInfo(annotate->exception);
+        annotate->exception = NULL;
+    }
+#endif
+
+    return Qnil;
+}
+
+
+/**
+ * Annotate the image.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param arg the annotate arguments
+ * @return self
+ * @see Draw_annotate
+ */
+static VALUE
+annotate_body(VALUE arg)
+{
+    struct Draw_annotate_args *annotate = (struct Draw_annotate_args *)arg;
+    Draw *draw = annotate->draw;
     Image *image;
     unsigned long width, height;
     long x, y;
-    AffineMatrix keep;
     char geometry_str[100];
     char *embed_text;
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
 
-    // Save the affine matrix in case it is modified by
-    // Draw#rotation=
-    draw = get_draw(self);
-    keep = draw->info->affine;
-
-    image_arg = rm_cur_image(image_arg);
-    image = rm_check_frozen(image_arg);
-
     // If we have an optional parm block, run it in self's context,
     // allowing the app a chance to modify the object's attributes
     if (rb_block_given_p())
     {
-        rb_yield(self);
+        rb_yield(annotate->self);
     }
 
-    // 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();
-#endif
-
-    // Create geometry string, copy to Draw structure, overriding
-    // any previously existing value.
-    width  = NUM2ULONG(width_arg);
-    height = NUM2ULONG(height_arg);
-    x      = NUM2LONG(x_arg);
-    y      = NUM2LONG(y_arg);
+    width  = NUM2ULONG(annotate->width_arg);
+    height = NUM2ULONG(annotate->height_arg);
+    x      = NUM2LONG(annotate->x_arg);
+    y      = NUM2LONG(annotate->y_arg);
 
     if (width == 0 && height == 0)
     {
@@ -916,25 +932,81 @@ VALUE Draw_annotate(
 
     magick_clone_string(&draw->info->geometry, geometry_str);
 
+    // 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(annotate->text);
+    image = rm_check_frozen(annotate->image_arg);
+    draw->info->text = ConstantString(embed_text);
+
 #if defined(IMAGEMAGICK_7)
-    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info, exception };
+    annotate->exception = AcquireExceptionInfo();
+    GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info, annotate->exception };
 #else
     GVL_STRUCT_TYPE(AnnotateImage) args = { image, draw->info };
 #endif
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(AnnotateImage), &args);
 
-    magick_free(draw->info->text);
-    draw->info->text = NULL;
-    draw->info->affine = keep;
-
 #if defined(IMAGEMAGICK_7)
+    exception = annotate->exception;
+    annotate->exception = NULL;
+
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 #else
     rm_check_image_exception(image, RetainOnError);
 #endif
 
-    return self;
+    return annotate->self;
+}
+
+
+/**
+ * Annotates an image with text.
+ *
+ * - Additional Draw attribute methods may be called in the optional block,
+ *   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.
+ * @param width_arg [Numeric] the width
+ * @param height_arg [Numeric] the height
+ * @param x_arg [Numeric] x position
+ * @param y_arg [Numeric] y position
+ * @param text [String] the annotation text
+ * @return [Magick::Draw] self
+ */
+VALUE Draw_annotate(
+                   VALUE self,
+                   VALUE image_arg,
+                   VALUE width_arg,
+                   VALUE height_arg,
+                   VALUE x_arg,
+                   VALUE y_arg,
+                   VALUE text)
+{
+    struct Draw_annotate_args annotate;
+
+    // Save the affine matrix in case it is modified by
+    // Draw#rotation=
+    annotate.draw = get_draw(self);
+    annotate.keep = annotate.draw->info->affine;
+
+    annotate.self       = self;
+    annotate.image_arg  = rm_cur_image(image_arg);
+    annotate.width_arg  = width_arg;
+    annotate.height_arg = height_arg;
+    annotate.x_arg      = x_arg;
+    annotate.y_arg      = y_arg;
+    annotate.text       = text;
+#if defined(IMAGEMAGICK_7)
+    annotate.exception  = NULL;
+#endif
+
+    rm_check_frozen(annotate.image_arg);
+
+    return rb_ensure(annotate_body, (VALUE)&annotate, annotate_ensure, (VALUE)&annotate);
 }
 
 

data/lib/rmagick/version.rb

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

data/lib/rvg/deep_equal.rb

@@ -17,7 +17,7 @@ module Magick
       end
     end
 
-    [Shape, TextBase, Image, Group, Content, Use, ClipPath, Pattern, self].each do |c|
+    [Shape, TextBase, Image, Group, Content, Use, ClipPath, Pattern, RVG].each do |c|
       c.class_eval do
         def deep_equal(other)
           ivs = instance_variables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.2
 platform: ruby
 authors:
 - Tim Hunter
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.9.0+ (for ImageMagick 6) or 7.1.0+ (for ImageMagick 7)
-rubygems_version: 4.0.16
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []