rmagick 7.0.1 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dde5ecba6c9f64a65d65582b49338a8d29e8385b3734f3a959b4c690f0c9ea66
-  data.tar.gz: d133faa5b9ab9a6647b5de590538bdcebb86aacaedf1153c0bb1ac5235a63de7
+  metadata.gz: 32acca4c4c8093c4473e8ed5347b925e688b1674082a8b11731508da616ca859
+  data.tar.gz: 184b70abce972992538f018162aa2a31e31e4d5ca864f945fa829de22a788501
 SHA512:
-  metadata.gz: 200d4179fbb2a170ac0e49ca3da399717d76eb5b66a66743fcefc3f4c75a107ecd90296c9c69446b8c7e690c966340c34b64f0c561a3826a86d3bb0d61a8eec7
-  data.tar.gz: e301f6a39bac7a1302630bbba806b225381f07716e4514c555d1d39a4e773106bcfc6f61a95cb06ff1aff11044461e448797407585db40518edab77d4f996c48
+  metadata.gz: 0d100afa5ed1091828e68066199393d0a5fd472aa635b6edabc37a4d916a1efe0e8c44f65567cdcda099996d1d30aece01120715ba1dabdb040497c9f595e207
+  data.tar.gz: 850e978981ebca5d4c63c59b2f577f4c9138eb48cab4402a59f78a54e95cfaac56b9806d690e025bae5502235e713d0b53c72645dac1bbcc855e43b5b05fc042

data/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 7.0.3
+
+Bug Fixes
+
+* Fix potential stack buffer overflows in format_exception and add_format_prefix (#1796)
+
+## RMagick 7.0.2
+
+Bug Fixes
+
+* Fix missing error check in KernelInfo#clone (#1794)
+* Fix memory leak in Image#gamma_correct (#1793)
+* Fix memory leak in Image#{color_profile=, iptc_profile=} when out of memory (#1792)
+* Fix memory leaks if level operations fail in Image#{level_colors, levelize_channel} (#1791)
+* Clean up ImageMagick resources on exit to fix ruby_memcheck false leaks (#1790)
+
 ## RMagick 7.0.1
 
 Bug Fixes

data/ext/RMagick/rmimage.cpp

@@ -2930,6 +2930,7 @@ set_profile(VALUE self, const char *name, VALUE profile)
     info = CloneImageInfo(NULL);
     if (!info)
     {
+        DestroyExceptionInfo(exception);
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
 
@@ -7646,7 +7647,7 @@ Image_gamma_correct(int argc, VALUE *argv, VALUE self)
     }
 
 #if defined(IMAGEMAGICK_7)
-    CHECK_EXCEPTION();
+    rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 #else
     rm_check_image_exception(new_image, DestroyOnError);
@@ -8675,6 +8676,7 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
 #endif
     if (!okay)
     {
+        DestroyImage(new_image);
         rb_raise(rb_eRuntimeError, "LevelImageColors failed for unknown reason.");
     }
 
@@ -8756,6 +8758,7 @@ Image_levelize_channel(int argc, VALUE *argv, VALUE self)
 
     if (!okay)
     {
+        DestroyImage(new_image);
         rb_raise(rb_eRuntimeError, "LevelizeImageChannel failed for unknown reason.");
     }
     return rm_image_new(new_image);
@@ -15830,6 +15833,9 @@ void add_format_prefix(Info *info, VALUE file)
     {
         memset(magic, '\0', sizeof(magic));
         magic_l = p - filename;
+        if (magic_l >= sizeof(magic)) {
+            magic_l = sizeof(magic) - 1;
+        }
         memcpy(magic, filename, magic_l);
 
         exception = AcquireExceptionInfo();

data/ext/RMagick/rmkinfo.cpp

@@ -162,6 +162,10 @@ VALUE
 KernelInfo_clone(VALUE self)
 {
     KernelInfo *kernel = CloneKernelInfo((KernelInfo*)DATA_PTR(self));
+    if (!kernel)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
     return TypedData_Wrap_Struct(Class_KernelInfo, &rm_kernel_info_data_type, kernel);
 }
 

data/ext/RMagick/rmmain.cpp

@@ -214,6 +214,12 @@ static void set_managed_memory(void)
 
 
 
+static void
+rmagick_terminus(VALUE unused)
+{
+    MagickCoreTerminus();
+}
+
 /**
  * Define the classes and constants.
  *
@@ -231,6 +237,7 @@ Init_RMagick2(void)
     set_managed_memory();
 
     MagickCoreGenesis("RMagick", MagickFalse);
+    rb_set_end_proc(rmagick_terminus, Qnil);
 
     test_Magick_version();
 

data/ext/RMagick/rmutil.cpp

@@ -1574,15 +1574,11 @@ rm_check_image_exception(Image *imglist, ErrorRetention retention)
 static void
 format_exception(const ExceptionType severity, const char *reason, const char *description, char *msg)
 {
-    int len;
     memset(msg, 0, ERROR_MSG_SIZE);
-
-    len = snprintf(msg, ERROR_MSG_SIZE, "%s%s%s",
+    snprintf(msg, ERROR_MSG_SIZE, "%s%s%s",
         GetLocaleExceptionMessage(severity, reason),
         description ? ": " : "",
         description ? GetLocaleExceptionMessage(severity, description) : "");
-
-    msg[len] = '\0';
 }
 
 

data/lib/rmagick/version.rb

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

metadata

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