rmagick 7.1.2 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64e970fa95ffd136462c610a760685197a4ed3ceb2c9e6dad90be7a0c8f3211
-  data.tar.gz: dc300b78b89fdb54386fbc10e14b55f6dd37497e65923ec48728abe3b3c85b1d
+  metadata.gz: a5c3f56f5b39c2f505f37875134e7af86904393036c531e6074f2796939f204c
+  data.tar.gz: 3bf4833ad9aa56f93e1d2426bd6c72b95c54e0c2c8dcd2c4248f62635bf7606e
 SHA512:
-  metadata.gz: f9ae77c69984d7472435ccfceda7c74637a4b2374e6529d40d47dae464629058a778c76208f7ca9c1644ecc2e50a44ca507abcd265fb57cff22c83fc7f031cf5
-  data.tar.gz: 3d620912beddcea78dc6953c461281f35bf5ea1c9d68c3cfe0c8a25c60cefc79f36c4834c559d59f448e1d749956755148425bd421a8f20e17859fd24f867e8f
+  metadata.gz: ff12f7c040309d906c8ba517cc4a10c472019c0b99d718f470f24b804021dd2a431b4fd876a59e0c18eb8acbb8edac0eb2e15b68826a8ba11779e62e5894a202
+  data.tar.gz: 06dfb967d7de90cdc6791dcbb2e9fc6b5ece9ccef12e53b3588ea96c09960e28cd938b9f982654ccd95c6f765cd65a1fae179e3c230d14f4548511d851f36de8

data/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.1.4
+
+> [!IMPORTANT]
+> Four kinds of input that used to be accepted now raise `ArgumentError`.
+>
+> Three of them were ways for a string RMagick documents as a value to be read back as part of an ImageMagick program: an opacity of `"1%\nimage Over 0,0 80,80 'secret.png'\n1%"`, a `Draw#pattern` name carrying the same payload, and a `Caption` property of `"@/etc/passwd"` arriving in the metadata of an uploaded image. ImageMagick executed the injected primitive, or read the named file and drew its contents into the returned image. `Image#dispatch` is the fourth: a `map` containing a NUL byte is now rejected rather than sized with the byte length while ImageMagick fills only what precedes the NUL.
+>
+> `Image#export_pixels_to_str` with `Magick::LongPixel` also returns half as many bytes on LP64, and `Image#import_pixels` takes a buffer of that size. RMagick reserved `sizeof(unsigned long)` per element while ImageMagick reads and writes `unsigned int`, so the second half of the string was never written and carried whatever the heap held. `Image#colormap` returned uninitialized memory the same way, as the previous colour of an entry it had just created.
+
+Breaking Changes
+
+* Reject an opacity percentage that is not a plain number from 0% to 100% (#1867)
+* Restrict a Draw#pattern name to letters, digits, hyphen, period and underscore (#1869)
+* Return LongPixel pixel data as unsigned int, without the uninitialized padding Image#export_pixels_to_str used to append (#1870)
+* Reject a Caption property beginning with '@' in Image#polaroid instead of reading that file (#1871)
+
+## RMagick 7.1.3
+
+Bug Fixes
+
+* Fix Magick.set_cache_threshold truncating the threshold on 32-bit platforms (#1865)
+* Fix Magick.limit_resource truncating 64-bit limits on 32-bit platforms (#1864)
+
 ## RMagick 7.1.2
 
 Bug Fixes
@@ -10,6 +33,7 @@ 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 Steep self type crash in RVG helper (#1851)
 * Fix memory leak in Draw#annotate when a geometry argument raises (#1850)
 
 ## RMagick 7.1.1

data/ext/RMagick/rmagick.cpp

@@ -217,7 +217,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
     ResourceType res = UndefinedResource;
     char *str;
     ID id;
-    unsigned long cur_limit;
+    MagickSizeType cur_limit;
 
     rb_scan_args(argc, argv, "11", &resource, &limit);
 
@@ -301,12 +301,12 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 
     if (argc > 1)
     {
-        SetMagickResourceLimit(res, (MagickSizeType)NUM2ULONG(limit));
+        SetMagickResourceLimit(res, (MagickSizeType)NUM2ULL(limit));
     }
 
     RB_GC_GUARD(limit);
 
-    return ULONG2NUM(cur_limit);
+    return ULL2NUM(cur_limit);
 }
 
 
@@ -320,9 +320,9 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE klass)
 VALUE
 Magick_set_cache_threshold(VALUE klass, VALUE threshold)
 {
-    unsigned long thrshld = NUM2ULONG(threshold);
-    SetMagickResourceLimit(MemoryResource, (MagickSizeType)thrshld);
-    SetMagickResourceLimit(MapResource, (MagickSizeType)(2*thrshld));
+    MagickSizeType thrshld = (MagickSizeType)NUM2ULL(threshold);
+    SetMagickResourceLimit(MemoryResource, thrshld);
+    SetMagickResourceLimit(MapResource, 2*thrshld);
     return klass;
 }
 

data/ext/RMagick/rmimage.cpp

@@ -3295,7 +3295,7 @@ Image_colormap(int argc, VALUE *argv, VALUE self)
             image->colormap = (PixelColor *)magick_safe_realloc(image->colormap, (idx+1), sizeof(PixelColor));
         }
 
-        for (i = image->colors; i < idx; i++)
+        for (i = image->colors; i <= idx; i++)
         {
             image->colormap[i] = black;
         }
@@ -5758,7 +5758,8 @@ Image_dispatch(int argc, VALUE *argv, VALUE self)
     y       = NUM2LONG(argv[1]);
     columns = NUM2ULONG(argv[2]);
     rows    = NUM2ULONG(argv[3]);
-    map     = rm_str2cstr(&argv[4], &mapL);
+    map     = StringValueCStr(argv[4]);
+    mapL    = strlen(map);
     if (argc == 6)
     {
         stg_type = RTEST(argv[5]) ? DoublePixel : QuantumPixel;
@@ -6903,7 +6904,7 @@ Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
             sz = sizeof(float);
             break;
         case LongPixel:
-            sz = sizeof(unsigned long);
+            sz = sizeof(unsigned int);
             break;
         case QuantumPixel:
             sz = sizeof(Quantum);
@@ -8174,7 +8175,7 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
                 type_sz = sizeof(unsigned short);
                 break;
             case LongPixel:
-                type_sz = sizeof(unsigned long);
+                type_sz = sizeof(unsigned int);
                 break;
             case DoublePixel:
                 type_sz = sizeof(double);
@@ -10867,7 +10868,8 @@ Image_pixel_interpolation_method_eq(VALUE self, VALUE method)
 
 /**
  * Produce an image that looks like a Polaroid instant picture. If the image has a "Caption"
- * property, the value is used as a caption.
+ * property, the value is used as a caption. A caption whose first non-blank character is '@'
+ * is rejected because ImageMagick reads the caption from the file it names.
  *
  * The following annotate attributes control the label rendering:
  * align, decorate, density, encoding, fill, font, font_family, font_stretch, font_style,
@@ -10888,6 +10890,7 @@ Image_pixel_interpolation_method_eq(VALUE self, VALUE method)
  *   @yieldparam opt [Magick::Image::PolaroidOptions]
  *
  * @return [Magick::Image] a new image
+ * @raise [ArgumentError] if the "Caption" property begins with '@'
  */
 VALUE
 Image_polaroid(int argc, VALUE *argv, VALUE self)
@@ -10897,9 +10900,7 @@ Image_polaroid(int argc, VALUE *argv, VALUE self)
     double angle = -5.0;
     Draw *draw;
     ExceptionInfo *exception;
-#if defined(IMAGEMAGICK_7)
     const char *caption;
-#endif
 
     image = rm_check_destroyed(self);
 
@@ -10924,6 +10925,26 @@ Image_polaroid(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
     caption = GetImageProperty(clone, "Caption", exception);
+#else
+    caption = GetImageProperty(clone, "Caption");
+#endif
+    if (caption)
+    {
+        const char *p = caption;
+
+        while (isspace((int) ((unsigned char) *p)))
+        {
+            p++;
+        }
+        if (*p == '@')
+        {
+            DestroyImage(clone);
+            DestroyExceptionInfo(exception);
+            rb_raise(rb_eArgError, "the Caption property must not begin with '@'");
+        }
+    }
+
+#if defined(IMAGEMAGICK_7)
     GVL_STRUCT_TYPE(PolaroidImage) args = { clone, draw->info, caption, angle, image->interpolate, exception };
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(PolaroidImage), &args);
 #else

data/lib/rmagick/version.rb

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

data/lib/rmagick_internal.rb

@@ -228,7 +228,12 @@ module Magick
     end
 
     def to_opacity(opacity)
-      return opacity if opacity.is_a?(String) && opacity.end_with?('%')
+      if opacity.is_a?(String) && opacity.end_with?('%')
+        percentage = /\A(\d*\.?\d+(?:[eE][-+]?\d+)?)%\z/.match(opacity)
+        Kernel.raise ArgumentError, 'opacity must be a percentage between 0% and 100%' unless percentage && Float(percentage[1]) <= 100
+
+        return opacity
+      end
 
       value = Float(opacity)
       Kernel.raise ArgumentError, 'opacity must be >= 0 and <= 1.0' if value < 0 || value > 1.0
@@ -448,14 +453,21 @@ module Magick
     # draw the pattern. Reference the pattern by using its name
     # as the argument to the 'fill' or 'stroke' methods
     def pattern(name, x, y, width, height)
+      name = to_string(name)
+      Kernel.raise ArgumentError, 'pattern name must consist of letters, digits, hyphen, period and underscore' unless /\A[\w.-]+\z/.match?(name)
+
+      viewport = sprintf('%g %g %g %g', x, y, width, height)
+
       push('defs')
-      push("pattern #{to_string(name)} " + sprintf('%g %g %g %g', x, y, width, height))
+      push("pattern #{name} " + viewport)
       push('graphic-context')
-      yield
-    ensure
-      pop('graphic-context')
-      pop('pattern')
-      pop('defs')
+      begin
+        yield
+      ensure
+        pop('graphic-context')
+        pop('pattern')
+        pop('defs')
+      end
     end
 
     # Set point to fill color.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.1.4
 platform: ruby
 authors:
 - Tim Hunter