rmagick 7.0.5 → 7.1.0

data/ext/RMagick/rmutil.cpp

@@ -338,6 +338,36 @@ rm_str2cstr(VALUE str, size_t *len)
 }
 
 
+/**
+ * Same as rm_str2cstr, but for arguments that name a file. Use this one for a
+ * pathname and rm_str2cstr for a blob.
+ *
+ * ImageMagick keeps a pathname in a fixed-size buffer and reads it back as a
+ * NUL-terminated C string, so a NUL byte in the middle of the argument would
+ * cut the pathname short and the file opened or created would not be the one
+ * the caller named. Ruby's own file methods reject such a pathname; going
+ * through StringValueCStr makes these do the same.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param str the Ruby string
+ * @param len pointer to a size_t in which to store the number of characters
+ * @return a C string version of str
+ * @throw ArgumentError if str contains a NUL byte
+ */
+char *
+rm_path2cstr(VALUE str, size_t *len)
+{
+    char *path = StringValueCStr(str);
+
+    if (len)
+    {
+        *len = (size_t)RSTRING_LEN(str);
+    }
+    return path;
+}
+
+
 /**
  * Called when `rb_str_to_str' raises an exception.
  *
@@ -509,7 +539,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
 
 
 /**
- * Convert a application-supplied number to a Quantum. If the object is a Float,
+ * Convert an application-supplied number to a Quantum. If the object is a Float,
  * truncate it before converting.
  *
  * No Ruby usage (internal function)
@@ -706,7 +736,7 @@ rm_set_magickpixel(MagickPixel *pp, const char *color)
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - The `temp_name' argument must point to an char array of size
+ *   - The `temp_name' argument must point to a char array of size
  *     MaxTextExtent.
  *
  * @param image the image
@@ -785,7 +815,7 @@ rm_delete_temp_image(char *temp_name)
  *   - This funky technique allows me to safely add additional information to
  *     the ImageMagickError object in both 1.6.8 and 1.8.0.
  *
- * @param msg the error mesage
+ * @param msg the error message
  * @throw ImageMagickError
  * @see www.ruby_talk.org/36408.
  */
@@ -937,7 +967,10 @@ void rm_set_user_artifact(Image *images, Info *info)
         image = GetFirstImageInList(images);
         while (image)
         {
-            SetImageArtifact(image, "user", value);
+            if (!SetImageArtifact(image, "user", value))
+            {
+                rb_raise(rb_eNoMemError, "not enough memory to continue");
+            }
             image = GetNextImageInList(image);
         }
     }
@@ -990,7 +1023,6 @@ rm_get_optional_arguments(VALUE img)
  */
 static void copy_options(Image *image, Info *info)
 {
-    char property[MaxTextExtent];
     const char *option;
 
     ResetImageOptionIterator(info);
@@ -1001,8 +1033,10 @@ static void copy_options(Image *image, Info *info)
         value = GetImageOption(info, option);
         if (value)
         {
-            strlcpy(property, value, sizeof(property));
-            SetImageArtifact(image, property, value);
+            if (!SetImageArtifact(image, option, value))
+            {
+                rb_raise(rb_eNoMemError, "not enough memory to continue");
+            }
         }
     }
 }
@@ -1483,7 +1517,7 @@ rm_clone_image(Image *image)
 
 
 /**
- * Remove the ImageMagick links between images in an scene sequence.
+ * Remove the ImageMagick links between images in a scene sequence.
  *
  * No Ruby usage (internal function)
  *
@@ -1569,7 +1603,7 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
  * @param severity information about the severity of the error
  * @param reason the reason for the error
  * @param description description of the error
- * @param msg the buffer where the exception message should be formated in
+ * @param msg the buffer where the exception message should be formatted in
  */
 static void
 format_exception(const ExceptionType severity, const char *reason, const char *description, char *msg)
@@ -1625,7 +1659,7 @@ rm_warning_handler(const ExceptionType severity, const char *reason, const char
 
 
 /**
- * Called from ImageMagick for a error.
+ * Called from ImageMagick for an error.
  *
  * No Ruby usage (internal function)
  *

data/lib/rmagick/version.rb

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

data/lib/rmagick_internal.rb

@@ -151,7 +151,7 @@ module Magick
   end
 
   class Draw
-    # Thse hashes are used to map Magick constant
+    # These hashes are used to map Magick constant
     # values to the strings used in the primitives.
     ALIGN_TYPE_NAMES = {
       LeftAlign.to_i => 'left',
@@ -217,10 +217,13 @@ module Magick
 
     def enquote(str)
       str = to_string(str)
-      if str.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(str)
+      # escape existing backslashes, so that they cannot escape the delimiter
+      # added below and let the rest of the string be parsed as MVG
+      str = str.gsub('\\') { |b| '\\' + b }
+      if str.length > 2 && /\A(?:"[^"\\]+"|'[^'\\]+'|\{[^}\\]+\})\z/.match(str)
         str
       else
-        '"' + str + '"'
+        '"' + str.gsub('"') { |c| '\\' + c } + '"'
       end
     end
 
@@ -282,7 +285,7 @@ module Magick
 
     # Invoke a clip-path defined by def_clip_path.
     def clip_path(name)
-      primitive "clip-path #{to_string(name)}"
+      primitive "clip-path #{enquote(name)}"
     end
 
     # Define the clipping rule.
@@ -343,7 +346,7 @@ module Magick
     # Let anything through, but the only defined argument
     # is "UTF-8". All others are apparently ignored.
     def encoding(encoding)
-      primitive "encoding #{to_string(encoding)}"
+      primitive "encoding #{enquote(encoding)}"
     end
 
     # Specify object fill, a color name or pattern name
@@ -612,7 +615,10 @@ module Magick
     def text(x, y, text)
       text = to_string(text)
       Kernel.raise ArgumentError, 'missing text argument' if text.empty?
-      if text.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(text)
+      # escape existing backslashes, so that they cannot escape the delimiter
+      # added below and let the rest of the string be parsed as MVG
+      text = text.gsub('\\') { |b| '\\' + b }
+      if text.length > 2 && /\A(?:"[^"\\]+"|'[^'\\]+'|\{[^}\\]+\})\z/.match(text)
       # text already quoted
       elsif !text['\'']
         text = '\'' + text + '\''
@@ -799,7 +805,7 @@ module Magick
     def color_reset!(fill)
       save = background_color
       # Change the background color _outside_ the begin block
-      # so that if this object is frozen the exeception will be
+      # so that if this object is frozen the exception will be
       # raised before we have to handle it explicitly.
       self.background_color = fill
       begin

data/lib/rvg/embellishable.rb

@@ -66,8 +66,15 @@ module Magick
       # Use the RVG::ShapeConstructors#path method to create Path objects in a container.
       def initialize(path)
         super()
+        path = path.to_s
+        # SVG path data is command letters, numbers, commas and whitespace only.
+        # Anything else could close the MVG token that Draw#path wraps this in
+        # and have the rest of the string executed as further MVG primitives.
+        invalid = path[/[^MmZzLlHhVvCcSsQqTtAa0-9eE.,+\-\s]/]
+        raise ArgumentError, "invalid character in path data (#{invalid.inspect} given)" if invalid
+
         @primitive = :path
-        @args = [path.to_s]
+        @args = [path]
       end
     end # class Path
 

data/lib/rvg/misc.rb

@@ -74,25 +74,6 @@ module Magick
           @ctx.shadow.affine = @ctx.text_attrs.affine
         end
 
-        def enquote(text)
-          return text if text.length > 2 && /\A(?:"[^"]+"|'[^']+'|\{[^}]+\})\z/.match(text)
-
-          if !text['\'']
-            text = '\'' + text + '\''
-            return text
-          elsif !text['"']
-            text = '"' + text + '"'
-            return text
-          elsif !(text['{'] || text['}'])
-            text = '{' + text + '}'
-            return text
-          end
-
-          # escape existing braces, surround with braces
-          text.gsub!(/[}]/) { |b| '\\' + b }
-          '{' + text + '}'
-        end
-
         def glyph_metrics(glyph_orientation, glyph)
           gm = @ctx.shadow.get_type_metrics('a' + glyph + 'a')
           gm2 = @ctx.shadow.get_type_metrics('aa')
@@ -151,13 +132,13 @@ module Magick
 
         def render_glyph(glyph_orientation, x, y, glyph)
           if glyph_orientation.zero?
-            @ctx.gc.text(x, y, enquote(glyph))
+            @ctx.gc.text(x, y, glyph)
           else
             @ctx.gc.push
             @ctx.gc.translate(x, y)
             @ctx.gc.rotate(glyph_orientation)
             @ctx.gc.translate(-x, -y)
-            @ctx.gc.text(x, y, enquote(glyph))
+            @ctx.gc.text(x, y, glyph)
             @ctx.gc.pop
           end
         end
@@ -295,7 +276,7 @@ module Magick
       # Handle "easy" text
       class DefaultTextStrategy < TextStrategy
         def render(x, y, text)
-          @ctx.gc.text(x, y, enquote(text))
+          @ctx.gc.text(x, y, text)
           tm = @ctx.shadow.get_type_metrics(text)
           dx = case @ctx.text_attrs.text_anchor
                when :start

data/lib/rvg/stylable.rb

@@ -80,10 +80,10 @@ module Magick
       # the hash keys. The style names and values are:
       # [:baseline_shift] modify the text baseline
       # [:clip_path] clipping path defined by clip_path
-      # [:clip_rule] 'evenodd' or 'nozero'
+      # [:clip_rule] 'evenodd' or 'nonzero'
       # [:fill] color name
       # [:fill_opacity] the fill opacity, 0.0<=N<=1.0
-      # [:fill_rule] 'evenodd' or 'nozero'
+      # [:fill_rule] 'evenodd' or 'nonzero'
       # [:font] font name or font file name
       # [:font_family] font family name, ex. 'serif'
       # [:font_size] font size in points

data/sig/rmagick/_image_common_methods.rbs

@@ -147,6 +147,7 @@ module Magick
     def alpha: () -> bool
              | (AlphaChannelOption value) -> AlphaChannelOption
     def alpha?: () -> bool
+    def artifact: (string artifact) -> String?
     def auto_gamma_channel: (*ChannelType channel) -> Image
     def auto_level_channel: (*ChannelType channel) -> Image
     def auto_orient: () -> Image

data/sig/rvg/misc.rbs

@@ -24,7 +24,6 @@ module Magick
         @ctx: GraphicContext
 
         def initialize: (GraphicContext context) -> void
-        def enquote: (String text) -> String
         def glyph_metrics: (Integer | Float glyph_orientation, string glyph) -> [Integer | Float, Integer | Float]
         def text_rel_coords: (string text) -> [Array[Integer | Float], Array[Integer | Float]]
         def shift_baseline: (Integer | Float glyph_orientation, string glyph) -> (Integer | Float)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.1.0
 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.15
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []