rmagick 7.0.4 → 7.1.0

data/ext/RMagick/rmimage.cpp

@@ -1318,7 +1318,7 @@ Image_background_color(VALUE self)
 
 
 /**
- * Set the the background color to the specified color spec.
+ * Set the background color to the specified color spec.
  *
  * @param color [Magick::Pixel, String] the color
  * @return [Magick::Pixel, String] the given color
@@ -1429,7 +1429,10 @@ Image_bias_eq(VALUE self, VALUE pct)
         char artifact[21];
 
         snprintf(artifact, sizeof(artifact), "%.20g", bias);
-        SetImageArtifact(image, "convolve:bias", artifact);
+        if (!SetImageArtifact(image, "convolve:bias", artifact))
+        {
+            rb_raise(rb_eNoMemError, "not enough memory to continue");
+        }
     }
 #else
     image->bias = bias;
@@ -1876,11 +1879,17 @@ special_composite(Image *image, Image *overlay, double image_pct, double overlay
 
     blend_geometry(geometry, sizeof(geometry), image_pct, overlay_pct);
     CloneString(&overlay->geometry, geometry);
-    SetImageArtifact(overlay, "compose:args", geometry);
+    if (!SetImageArtifact(overlay, "compose:args", geometry))
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
 
     new_image = rm_clone_image(image);
-    SetImageArtifact(new_image, "compose:args", geometry); // 6.9 appears to get this info from canvas (dest) image
-
+    if (!SetImageArtifact(new_image, "compose:args", geometry)) // 6.9 appears to get this info from canvas (dest) image
+    {
+        DestroyImage(new_image);
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
@@ -1907,12 +1916,12 @@ special_composite(Image *image, Image *overlay, double image_pct, double overlay
  * @overload blend(overlay, src_percent, dst_percent, gravity = Magick::NorthWestGravity, x_offset = 0, y_offset = 0)
  *   @param overlay [Magick::Image, Magick::ImageList] The source image for the composite operation.
  *     Either an imagelist or an image. If an imagelist, uses the current image.
- *   @param src_percent [Numeric, String] Either a non-negative number a string in the form "NN%".
+ *   @param src_percent [Numeric, String] Either a non-negative number or a string in the form "NN%".
  *     If src_percentage is a number it is interpreted as a percentage.
  *     Both 0.25 and "25%" mean 25%. This argument is required.
- *   @param dst_percent [Numeric, String] Either a non-negative number a string in the form "NN%".
+ *   @param dst_percent [Numeric, String] Either a non-negative number or a string in the form "NN%".
  *     If src_percentage is a number it is interpreted as a percentage.
- *     Both 0.25 and "25%" mean 25%. This argument may omitted if no other arguments follow it.
+ *     Both 0.25 and "25%" mean 25%. This argument may be omitted if no other arguments follow it.
  *     In this case the default is 100%-src_percentage.
  *   @param gravity [Magick::GravityType] the gravity for offset. the offsets are measured from the NorthWest corner by default.
  *   @param x_offset [Numeric] The offset that measured from the left-hand side of the target image.
@@ -2182,7 +2191,7 @@ Image_border_color(VALUE self)
 
 
 /**
- * Set the the border color.
+ * Set the border color.
  *
  * @param [Magick::Pixel, String] color the color
  * @return [Magick::Pixel, String] the given color
@@ -3388,7 +3397,7 @@ Image_columns(VALUE self)
  *   - options.highlight_color = color
  *     - Emphasize pixel differences with this color. The default is partially transparent red.
  *   - options.lowlight_color = color
- *     - Demphasize pixel differences with this color. The default is partially transparent white.
+ *     - De-emphasize pixel differences with this color. The default is partially transparent white.
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *   @param metric [Magick::MetricType] The desired distortion metric.
@@ -3408,7 +3417,7 @@ Image_columns(VALUE self)
  *   - options.highlight_color = color
  *     - Emphasize pixel differences with this color. The default is partially transparent red.
  *   - options.lowlight_color = color
- *     - Demphasize pixel differences with this color. The default is partially transparent white.
+ *     - De-emphasize pixel differences with this color. The default is partially transparent white.
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *   @param metric [Magick::MetricType] The desired distortion metric.
@@ -3416,7 +3425,7 @@ Image_columns(VALUE self)
  *   @yield [opt_args]
  *   @yieldparam opt_args [Magick::OptionalMethodArguments]
  *
- * @return [Array] The first element is a difference image, the second is a the value of the
+ * @return [Array] The first element is a difference image, the second is the value of the
  *   computed distortion represented as a Float.
  */
 VALUE
@@ -4072,7 +4081,10 @@ Image_composite_mathematics(int argc, VALUE *argv, VALUE self)
     composite_image = rm_check_destroyed(rm_cur_image(argv[0]));
 
     snprintf(compose_args, sizeof(compose_args), "%-.16g,%-.16g,%-.16g,%-.16g", NUM2DBL(argv[1]), NUM2DBL(argv[2]), NUM2DBL(argv[3]), NUM2DBL(argv[4]));
-    SetImageArtifact(composite_image, "compose:args", compose_args);
+    if (!SetImageArtifact(composite_image, "compose:args", compose_args))
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
 
     // Call composite(False, gravity, x_off, y_off, MathematicsCompositeOp, DefaultChannels)
     args[0] = argv[0];
@@ -4145,13 +4157,16 @@ composite_tiled(int bang, int argc, VALUE *argv, VALUE self)
 
     comp_image = rm_check_destroyed(rm_cur_image(argv[0]));
 
+    if (!SetImageArtifact(comp_image, "modify-outside-overlay", "false"))
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
+
     if (!bang)
     {
         image = rm_clone_image(image);
     }
 
-    SetImageArtifact(comp_image, "modify-outside-overlay", "false");
-
     status = MagickTrue;
     columns = comp_image->columns;
 
@@ -4656,7 +4671,7 @@ Image_contrast_stretch_channel(int argc, VALUE *argv, VALUE self)
 }
 
 /**
- * Apply a user supplied kernel to the image according to the given mophology method.
+ * Apply a user supplied kernel to the image according to the given morphology method.
  *
  * @param method_v [Magick::MorphologyMethod] the morphology method
  * @param iterations [Numeric] apply the operation this many times (or no change).
@@ -4681,7 +4696,7 @@ Image_morphology(VALUE self, VALUE method_v, VALUE iterations, VALUE kernel_v)
 }
 
 /**
- * Apply a user supplied kernel to the image channel according to the given mophology method.
+ * Apply a user supplied kernel to the image channel according to the given morphology method.
  *
  * @param channel_v [Magick::ChannelType] a channel type
  * @param method_v [Magick::MorphologyMethod] the morphology method
@@ -5241,6 +5256,28 @@ Image_decipher(VALUE self, VALUE passphrase)
 }
 
 
+/**
+ * Return the value of an artifact set by {Magick::Image#define} or by
+ * {Magick::Image::Info#define}.
+ *
+ * @param artifact [String] the artifact to look up
+ * @return [String, nil] the value, or nil if the artifact is not set
+ * @see Magick::Image#define
+ */
+VALUE
+Image_artifact(VALUE self, VALUE artifact)
+{
+    Image *image;
+    const char *value;
+
+    image = rm_check_destroyed(self);
+    artifact = rb_String(artifact);
+    value = GetImageArtifact(image, StringValueCStr(artifact));
+
+    return value ? rb_str_new2(value) : Qnil;
+}
+
+
 /**
  * Associates makes a copy of the given string arguments and
  * inserts it into the artifact tree.
@@ -5427,7 +5464,10 @@ Image_deskew(int argc, VALUE *argv, VALUE self)
             width = NUM2ULONG(argv[1]);
             memset(auto_crop_width, 0, sizeof(auto_crop_width));
             snprintf(auto_crop_width, sizeof(auto_crop_width), "%lu", width);
-            SetImageArtifact(image, "deskew:auto-crop", auto_crop_width);
+            if (!SetImageArtifact(image, "deskew:auto-crop", auto_crop_width))
+            {
+                rb_raise(rb_eNoMemError, "not enough memory to continue");
+            }
         case 1:
             threshold = rm_percentage(argv[0], 1.0) * QuantumRange;
         case 0:
@@ -5630,6 +5670,41 @@ Image_displace(int argc, VALUE *argv, VALUE self)
 }
 
 
+/**
+ * Compute columns * rows * map_length for a pixel buffer, raising RangeError on
+ * overflow.
+ *
+ * The product is used to size the buffer that ImageMagick fills based on the
+ * (caller-supplied) columns and rows. If the multiplication wrapped around, the
+ * buffer would be allocated too small and ImageMagick would write out of bounds.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param columns the number of columns
+ * @param rows the number of rows
+ * @param map_length the number of channels per pixel (length of the map string)
+ * @return columns * rows * map_length
+ * @throw RangeError if the multiplication overflows
+ */
+static size_t
+pixel_buffer_count(size_t columns, size_t rows, size_t map_length)
+{
+    size_t pixels;
+
+    if (columns != 0 && rows > SIZE_MAX / columns)
+    {
+        rb_raise(rb_eRangeError, "pixel buffer dimensions too large (%" RMIuSIZE "x%" RMIuSIZE ")", columns, rows);
+    }
+    pixels = columns * rows;
+    if (map_length != 0 && pixels > SIZE_MAX / map_length)
+    {
+        rb_raise(rb_eRangeError, "pixel buffer dimensions too large (%" RMIuSIZE "x%" RMIuSIZE " map=%" RMIuSIZE ")",
+                 columns, rows, map_length);
+    }
+    return pixels * map_length;
+}
+
+
 /**
  * Extract pixel data from the image and returns it as an array of pixels. The "x", "y", "width" and
  * "height" parameters specify the rectangle to be extracted. The "map" parameter reflects the
@@ -5685,7 +5760,7 @@ Image_dispatch(int argc, VALUE *argv, VALUE self)
     }
 
     // Compute the size of the pixel array and allocate the memory.
-    npixels = columns * rows * mapL;
+    npixels = pixel_buffer_count(columns, rows, mapL);
     pixels.v = stg_type == QuantumPixel ? (void *) ALLOC_N(Quantum, npixels)
                : (void *) ALLOC_N(double, npixels);
 
@@ -5814,12 +5889,12 @@ Image_dispose_eq(VALUE self, VALUE dispose)
  * @overload dissolve(overlay, src_percent, dst_percent = -1.0, gravity = Magick::NorthWestGravity, x_offset = 0, y_offset = 0)
  *   @param overlay [Magick::Image, Magick::ImageList] The source image for the composite operation.
  *     Either an imagelist or an image. If an imagelist, uses the current image.
- *   @param src_percent [Numeric, String] Either a non-negative number a string in the form "NN%".
+ *   @param src_percent [Numeric, String] Either a non-negative number or a string in the form "NN%".
  *     If src_percentage is a number it is interpreted as a percentage.
  *     Both 0.25 and "25%" mean 25%. This argument is required.
- *   @param dst_percent [Numeric, String] Either a non-negative number a string in the form "NN%".
+ *   @param dst_percent [Numeric, String] Either a non-negative number or a string in the form "NN%".
  *     If src_percentage is a number it is interpreted as a percentage.
- *     Both 0.25 and "25%" mean 25%. This argument may omitted if no other arguments follow it.
+ *     Both 0.25 and "25%" mean 25%. This argument may be omitted if no other arguments follow it.
  *     In this case the default is 100%-src_percentage.
  *   @param gravity [Magick::GravityType] the gravity for offset. the offsets are measured from the
  *     NorthWest corner by default.
@@ -5899,7 +5974,7 @@ Image_dissolve(int argc, VALUE *argv, VALUE self)
  *       the image (with appropriate viewport changes, or post-distort cropping and resizing).
  *   - options.verbose(true)
  *     - Attempt to output the internal coefficients, and the -fx equivalent to the distortion, for
-         expert study, and debugging purposes. This many not be available for all distorts.
+         expert study, and debugging purposes. This may not be available for all distorts.
  *   @param type [Magick::DistortMethod] a DistortMethod value
  *   @param points [Array<Numeric>] an Array of Numeric values. The size of the array depends on the distortion type.
  *   @param bestfit [Boolean] If bestfit is enabled, and the distortion allows it, the destination
@@ -6105,7 +6180,7 @@ Image__dump(VALUE self, VALUE depth ATTRIBUTE_UNUSED)
 
 
 /**
- * Duplicates a image.
+ * Duplicates an image.
  *
  * @return [Magick::Image] a new image
  */
@@ -6636,7 +6711,7 @@ Image_export_pixels(int argc, VALUE *argv, VALUE self)
     }
 
 
-    npixels = (long)(cols * rows * strlen(map));
+    npixels = (long)pixel_buffer_count(cols, rows, strlen(map));
     pixels = ALLOC_N(Quantum, npixels);
     if (!pixels)    // app recovered from exception
     {
@@ -6804,7 +6879,7 @@ Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
     }
 
 
-    npixels = cols * rows * strlen(map);
+    npixels = pixel_buffer_count(cols, rows, strlen(map));
     switch (type)
     {
         case CharPixel:
@@ -6833,6 +6908,10 @@ Image_export_pixels_to_str(int argc, VALUE *argv, VALUE self)
 
     // Allocate a string long enough to hold the exported pixel data.
     // Get a pointer to the buffer.
+    if (npixels != 0 && sz > (size_t)LONG_MAX / npixels)
+    {
+        rb_raise(rb_eRangeError, "pixel buffer dimensions too large");
+    }
     string = rb_str_new2("");
     rb_str_resize(string, (long)(sz * npixels));
 
@@ -7086,7 +7165,7 @@ Image_flip_bang(VALUE self)
 
 
 /**
- * Create a horizonal mirror image by reflecting the pixels around the central y-axis.
+ * Create a horizontal mirror image by reflecting the pixels around the central y-axis.
  *
  * @return [Magick::Image] a new image
  * @see Image#flop!
@@ -7102,7 +7181,7 @@ Image_flop(VALUE self)
 
 
 /**
- * Create a horizonal mirror image by reflecting the pixels around the central y-axis.
+ * Create a horizontal mirror image by reflecting the pixels around the central y-axis.
  * In-place form of {Image#flop}.
  *
  * @return [Magick::Image] self
@@ -8012,7 +8091,7 @@ Image_implode(int argc, VALUE *argv, VALUE self)
  *   @param y [Numeric] The y-offset of the rectangle to be replaced.
  *   @param columns [Numeric] The number of columns in the rectangle.
  *   @param rows [Numeric] The number of rows in the rectangle.
- *   @param map [String] his string reflects the expected ordering of the pixel array.
+ *   @param map [String] This string reflects the expected ordering of the pixel array.
  *   @param pixels [Array] An array of pixels.
  *     The number of pixels in the array must be the same as the number
  *     of pixels in the rectangle, that is, rows*columns.
@@ -8026,8 +8105,8 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
 {
     Image *image;
     long x_off, y_off;
-    unsigned long cols, rows;
-    unsigned long n, npixels;
+    long cols, rows;
+    size_t n, npixels;
     size_t buffer_l;
     char *map;
     VALUE pixel_arg, pixel_ary;
@@ -8050,8 +8129,8 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
         case 6:
             x_off = NUM2LONG(argv[0]);
             y_off = NUM2LONG(argv[1]);
-            cols = NUM2ULONG(argv[2]);
-            rows = NUM2ULONG(argv[3]);
+            cols = NUM2LONG(argv[2]);
+            rows = NUM2LONG(argv[3]);
             map = StringValueCStr(argv[4]);
             pixel_arg = argv[5];
             break;
@@ -8065,8 +8144,12 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "invalid import geometry");
     }
 
-    map_l = rm_strnlen_s(map, MaxTextExtent);
-    npixels = cols * rows * map_l;
+    map_l = strlen(map);
+    if (map_l == 0)
+    {
+        rb_raise(rb_eArgError, "map must not be empty");
+    }
+    npixels = pixel_buffer_count((size_t)cols, (size_t)rows, map_l);
 
     // Assume that any object that responds to :to_str is a string buffer containing
     // binary pixel data.
@@ -8106,9 +8189,9 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
         {
             rb_raise(rb_eArgError, "pixel buffer must contain an exact multiple of the map length");
         }
-        if ((unsigned long)(buffer_l / type_sz) < npixels)
+        if (buffer_l / type_sz < npixels)
         {
-            rb_raise(rb_eArgError, "pixel buffer too small (need %lu channel values, got %" RMIuSIZE ")",
+            rb_raise(rb_eArgError, "pixel buffer too small (need %" RMIuSIZE " channel values, got %" RMIuSIZE ")",
                      npixels, buffer_l/type_sz);
         }
     }
@@ -8124,9 +8207,9 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
         {
             rb_raise(rb_eArgError, "pixel array must contain an exact multiple of the map length");
         }
-        if ((unsigned long)RARRAY_LEN(pixel_ary) < npixels)
+        if ((size_t)RARRAY_LEN(pixel_ary) < npixels)
         {
-            rb_raise(rb_eArgError, "pixel array too small (need %lu elements, got %ld)",
+            rb_raise(rb_eArgError, "pixel array too small (need %" RMIuSIZE " elements, got %ld)",
                      npixels, RARRAY_LEN(pixel_ary));
         }
 
@@ -8173,9 +8256,9 @@ Image_import_pixels(int argc, VALUE *argv, VALUE self)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(ImportImagePixels) args = { image, x_off, y_off, cols, rows, map, stg_type, buffer, exception };
+    GVL_STRUCT_TYPE(ImportImagePixels) args = { image, x_off, y_off, (size_t)cols, (size_t)rows, map, stg_type, buffer, exception };
 #else
-    GVL_STRUCT_TYPE(ImportImagePixels) args = { image, x_off, y_off, cols, rows, map, stg_type, buffer };
+    GVL_STRUCT_TYPE(ImportImagePixels) args = { image, x_off, y_off, (size_t)cols, (size_t)rows, map, stg_type, buffer };
 #endif
     void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ImportImagePixels), &args);
     okay = static_cast<MagickBooleanType>(reinterpret_cast<intptr_t &>(ret));
@@ -8875,7 +8958,7 @@ Image__load(VALUE klass ATTRIBUTE_UNUSED, VALUE str)
 
     blob = rm_str2cstr(str, &length);
 
-    // Must be as least as big as the 1st 4 fields in DumpedImage
+    // Must be at least as big as the 1st 4 fields in DumpedImage
     if (length <= (long)(sizeof(DumpedImage)-MaxTextExtent))
     {
         rb_raise(rb_eTypeError, "image is invalid or corrupted (too short)");
@@ -9056,6 +9139,8 @@ Image_marshal_load(VALUE self, VALUE ary)
 
     TypedData_Get_Struct(self, Image, &rm_image_data_type, image);
 
+    Check_Type(ary, T_ARRAY);
+
     filename = rb_ary_shift(ary);
     blob = rb_ary_shift(ary);
 
@@ -11539,7 +11624,7 @@ rd_image(VALUE klass ATTRIBUTE_UNUSED, VALUE file, gvl_function_t fp)
         // Convert arg to string. If an exception occurs raise an error condition.
         file = rb_rescue(RESCUE_FUNC(rb_String), file, RESCUE_EXCEPTION_HANDLER_FUNC(file_arg_rescue), file);
 
-        filename = rm_str2cstr(file, &filename_l);
+        filename = rm_path2cstr(file, &filename_l);
         filename_l = min(filename_l, MaxTextExtent-1);
         if (filename_l == 0)
         {
@@ -11626,7 +11711,7 @@ Image_recolor(VALUE self, VALUE color_matrix)
         }
     }
 
-    order = (unsigned long)sqrt((double)(len + 1.0));
+    order = (unsigned long)sqrt((double)len);
 
     exception = AcquireExceptionInfo();
 #if defined(IMAGEMAGICK_7)
@@ -12750,7 +12835,7 @@ Image_sepiatone(int argc, VALUE *argv, VALUE self)
  *   @param colorspace [Magick::ColorspaceType] A ColorspaceType value. Empirical evidence suggests
  *     that distances in YUV or YIQ correspond to perceptual color differences more closely than do
  *     distances in RGB space. The image is then returned to RGB colorspace after color reduction.
- *   @param cluster_threshold [Numeric] The number of pixels in each cluster must exceed the the
+ *   @param cluster_threshold [Numeric] The number of pixels in each cluster must exceed the
  *     cluster threshold to be considered valid.
  *   @param smoothing_threshold [Numeric] The smoothing threshold eliminates noise in the second
  *     derivative of the histogram. As the value is increased, you can expect a smoother second
@@ -13092,7 +13177,7 @@ Image_sharpen_channel(int argc, VALUE *argv, VALUE self)
  * center.
  *
  * @param width [Numeric] the width to leave
- * @param height [Numeric] the hight to leave
+ * @param height [Numeric] the height to leave
  * @return [Magick::Image] a new image
  * @see Image#shave!
  */
@@ -13110,7 +13195,7 @@ Image_shave(VALUE self, VALUE width, VALUE height)
  * In-place form of {Image#shave}.
  *
  * @param width [Numeric] the width to leave
- * @param height [Numeric] the hight to leave
+ * @param height [Numeric] the height to leave
  * @return [Magick::Image] a new image
  * @see Image#shave
  */
@@ -14488,7 +14573,7 @@ Image_tint(int argc, VALUE *argv, VALUE self)
  * Return a "blob" (a String) from the image.
  *
  * - The magick member of the Image structure determines the format of the
- *   returned blob (GIG, JPEG,  PNG, etc.)
+ *   returned blob (GIF, JPEG,  PNG, etc.)
  *
  * @yield [info]
  * @yieldparam info [Magick::Image::Info]
@@ -14808,7 +14893,7 @@ Image_transparent_color(VALUE self)
 
 
 /**
- * Set the the transparent color to the specified color spec.
+ * Set the transparent color to the specified color spec.
  *
  * @param color [Magick::Pixel, String] the transparent color
  * @return [Magick::Pixel, String] the given color
@@ -15190,13 +15275,13 @@ Image_units_eq(VALUE self, VALUE restype)
 /**
  * Sharpen an image. "amount" is the percentage of the difference between the original and the blur
  * image that is added back into the original. "threshold" is the threshold in pixels needed to
- * apply the diffence amount.
+ * apply the difference amount.
  *
  * No Ruby usage (internal function)
  *
  * @param argc number of input arguments
  * @param argv array of input arguments
- * @param radious the radious
+ * @param radius the radius
  * @param sigma the sigma
  * @param amount the amount
  * @param threshold the threshold
@@ -15236,7 +15321,7 @@ unsharp_mask_args(int argc, VALUE *argv, double *radius, double *sigma,
             break;
 
             // This case can't occur if we're called from Image_unsharp_mask_channel
-            // because it has already raised an exception for the the argc > 4 case.
+            // because it has already raised an exception for the argc > 4 case.
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 to 4)", argc);
     }
@@ -15246,7 +15331,7 @@ unsharp_mask_args(int argc, VALUE *argv, double *radius, double *sigma,
 /**
  * Sharpen an image. "amount" is the percentage of the difference between the original and the blur
  * image that is added back into the original. "threshold" is the threshold in pixels needed to
- * apply the diffence amount.
+ * apply the difference amount.
  *
  * @overload unsharp_mask(radius = 0.0, sigma = 1.0, amount = 1.0, threshold = 0.05)
  *   @param radius [Numeric] The radius of the Gaussian operator.
@@ -15281,7 +15366,7 @@ Image_unsharp_mask(int argc, VALUE *argv, VALUE self)
 /**
  * Sharpen an image. "amount" is the percentage of the difference between the original and the blur
  * image that is added back into the original. "threshold" is the threshold in pixels needed to
- * apply the diffence amount.
+ * apply the difference amount.
  *
  * Only the specified channels are sharpened.
  *
@@ -15459,7 +15544,7 @@ Image_virtual_pixel_method_eq(VALUE self, VALUE method)
  *     25%. The default is 100%.
  *   @param x_off [Numeric] The offset of the watermark, measured from the left-hand side of the
  *     target image.
- *   @param y_off [Numeri] The offset of the watermark, measured from the top of the target image.
+ *   @param y_off [Numeric] The offset of the watermark, measured from the top of the target image.
  *
  * @overload watermark(mark, brightness, saturation, gravity, x_off = 0, y_off = 0)
  *   @param mark [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
@@ -15476,7 +15561,7 @@ Image_virtual_pixel_method_eq(VALUE self, VALUE method)
  *     NorthWest corner by default.
  *   @param x_off [Numeric] The offset of the watermark, measured from the left-hand side of the
  *     target image.
- *   @param y_off [Numeri] The offset of the watermark, measured from the top of the target image.
+ *   @param y_off [Numeric] The offset of the watermark, measured from the top of the target image.
  *
  * @return [Magick::Image] a new image
  */
@@ -15524,7 +15609,10 @@ Image_watermark(int argc, VALUE *argv, VALUE self)
 
     blend_geometry(geometry, sizeof(geometry), src_percent, dst_percent);
     CloneString(&overlay->geometry, geometry);
-    SetImageArtifact(overlay, "compose:args", geometry);
+    if (!SetImageArtifact(overlay, "compose:args", geometry))
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
 
     new_image = rm_clone_image(image);
 #if defined(IMAGEMAGICK_7)
@@ -15825,7 +15913,7 @@ void add_format_prefix(Info *info, VALUE file)
     }
     file = rb_rescue(RESCUE_FUNC(rb_String), file, RESCUE_EXCEPTION_HANDLER_FUNC(file_arg_rescue), file);
 
-    filename = rm_str2cstr(file, &filename_l);
+    filename = rm_path2cstr(file, &filename_l);
 
     if (*info->magick == '\0')
     {

data/ext/RMagick/rminfo.cpp

@@ -199,7 +199,15 @@ static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
         {
             len = snprintf(buff, sizeof(buff), "%-10.2f", d);
         }
-        memset(buff+len, '\0', sizeof(buff)-len);
+        if (len < 0)
+        {
+            len = 0;
+        }
+        else if ((size_t)len > sizeof(buff) - 1)
+        {
+            len = (int)(sizeof(buff) - 1);
+        }
+        memset(buff+len, '\0', sizeof(buff)-(size_t)len);
         SetImageOption(info, option, buff);
     }
 
@@ -1936,7 +1944,7 @@ Info_server_name_eq(VALUE self, VALUE server_arg)
 }
 
 /**
- * Get ths size
+ * Get the size
  *
  * @return [String] the size as a Geometry object
  * @see https://www.imagemagick.org/Magick++/Geometry.html
@@ -2374,7 +2382,7 @@ Info_alloc(VALUE klass)
 
 
 /**
- * Provide a Info.new method for internal use.
+ * Provide an Info.new method for internal use.
  *
  * No Ruby usage (internal function)
  *

data/ext/RMagick/rmkinfo.cpp

@@ -194,7 +194,7 @@ KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 }
 
 /**
- * Creates a new clone of the object so that its can be modified without effecting the original.
+ * Creates a new clone of the object so that it can be modified without affecting the original.
  *
  * @return [Magick::KernelInfo] new KernelInfo object
  */

data/ext/RMagick/rmmain.cpp

@@ -120,7 +120,7 @@ rm_aligned_malloc_size(void *ptr)
 #elif defined(HAVE_MALLOC_SIZE)
     return malloc_size(ptr);
 #elif defined(HAVE__ALIGNED_MSIZE)
-// Refered to https://github.com/ImageMagick/ImageMagick/blob/master/MagickCore/memory-private.h
+// Referred to https://github.com/ImageMagick/ImageMagick/blob/master/MagickCore/memory-private.h
 #define MAGICKCORE_SIZEOF_VOID_P 8
 #define CACHE_LINE_SIZE  (8 * MAGICKCORE_SIZEOF_VOID_P)
     size_t _aligned_msize(void *memblock, size_t alignment, size_t offset);
@@ -407,6 +407,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "alpha?", RUBY_METHOD_FUNC(Image_alpha_q), 0);
     rb_define_method(Class_Image, "[]", RUBY_METHOD_FUNC(Image_aref), 1);
     rb_define_method(Class_Image, "[]=", RUBY_METHOD_FUNC(Image_aset), 2);
+    rb_define_method(Class_Image, "artifact", RUBY_METHOD_FUNC(Image_artifact), 1);
     rb_define_method(Class_Image, "auto_gamma_channel", RUBY_METHOD_FUNC(Image_auto_gamma_channel), -1);
     rb_define_method(Class_Image, "auto_level_channel", RUBY_METHOD_FUNC(Image_auto_level_channel), -1);
     rb_define_method(Class_Image, "auto_orient", RUBY_METHOD_FUNC(Image_auto_orient), 0);
@@ -1812,7 +1813,7 @@ test_Magick_version(void)
 
     /* ImageMagick versions are defined as major, minor and patch, each of which are defined as a value in 1 byte. */
     /* ImageMagick 6.9.12 has `#define MagickLibVersion  0x69C` */
-    /* It use only major and minor versions. */
+    /* It uses only major and minor versions. */
     size_t mask_major_minor_version = 0xFFFFFFF0;
 
     version_str = GetMagickVersion(&version_number);

data/ext/RMagick/rmmontage.cpp

@@ -23,7 +23,7 @@ const rb_data_type_t rm_montage_data_type = {
 
 
 /**
- * Destory the MontageInfo struct and free the Montage struct.
+ * Destroy the MontageInfo struct and free the Montage struct.
  *
  * No Ruby usage (internal function)
  *

data/ext/RMagick/rmpixel.cpp

@@ -463,7 +463,7 @@ Color_to_Pixel(Pixel *pp, VALUE color)
  * No Ruby usage (internal function)
  *
  * @param color the PixelColor to modify
- * @param name_arg the coor name
+ * @param name_arg the color name
  * @throw ArgumentError
  */
 static void
@@ -666,14 +666,14 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Construct an {Magick::Pixel} corresponding to the given color name.
+ * Construct a {Magick::Pixel} corresponding to the given color name.
  *
  * - The "inverse" is {Image#to_color}, b/c the conversion of a pixel to a
  *   color name requires both a color depth and if the opacity value has
  *   meaning.
  *
  * @param name [String] the color name
- * @return [Magick::Pixel] a new Magic::Pixel object
+ * @return [Magick::Pixel] a new Magick::Pixel object
  * @see Magick::Image#to_color
  * @see Magick::Pixel#to_color
  */
@@ -1009,7 +1009,7 @@ Pixel_intensity(VALUE self)
 /**
  * Support Marshal.dump.
  *
- * @return [Hash] a representing the dumped pixel
+ * @return [Hash] a Hash representing the dumped pixel
  */
 VALUE
 Pixel_marshal_dump(VALUE self)
@@ -1046,6 +1046,9 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
     Pixel *pixel;
 
     TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
+
+    Check_Type(dpixel, T_HASH);
+
     pixel->red = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("red")));
     pixel->green = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("green")));
     pixel->blue = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("blue")));