rmagick 6.1.4 → 6.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 869808111e9ff5a238c87513cf287fccf958b962a0d0a11cef7d7f2e4d66f1a4
-  data.tar.gz: 781eeaca5f13d2544c41a26faa9c7a7d7a08c8a8615d8982e6ae8ebfef73fee0
+  metadata.gz: abd4bb9648eeac55cad07daf192bd139e0310912a97c9511c3a598e87843f586
+  data.tar.gz: 37d89abbb4e552c8f8c620cee0f52534c6ed340e27497cb63a438145bb9e9e59
 SHA512:
-  metadata.gz: 1e587419ce08959d886d52e1a21648444ef3054f385b8f4aa78cbcd66d37467730555d8ff7e4ba1db753fc98918f65b64b075906dae5a26daf15bdd792a8a589
-  data.tar.gz: 006f8c9ab91b011cc1a53c588ad4e7e85ecd015efbb3984f154dddff2de030d64209e97a69ce921d053938ffd758351636d42357197076a9be3e19c3d45795ef
+  metadata.gz: 0c7f59350e7c28248d76bbdc75546c658ad5dece7c0d5e76fa83bd5dfda6506a511ea11e7573938bb045f8468bd6deb16b0a829bb5ad5e1b4aae25a7381cdbf2
+  data.tar.gz: 6575a013a6d86aa063b1825dee76d21b6b9e5948e4b680a860f1857f22026d1af8cdd06d54eae38a48e6aa71062b07e558c6df59eb1d470c95c60f5096ee7453

data/.devcontainer/ImageMagick6/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "../Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "6.9.13-27"
+      "IMAGEMAGICK_VERSION": "6.9.13-33"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
     "dockerfile": "Dockerfile",
     "args": {
       "RUBY_VERSION": "3.3.3",
-      "IMAGEMAGICK_VERSION": "7.1.2-1"
+      "IMAGEMAGICK_VERSION": "7.1.2-8"
     }
   },
   "onCreateCommand": "/setup/setup-repo.sh"

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@master
       with:
@@ -30,7 +30,7 @@ jobs:
     name: RBS
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Ruby 3.0
       uses: ruby/setup-ruby@master
       with:
@@ -55,7 +55,7 @@ jobs:
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -82,14 +82,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0.0-preview2']
         imagemagick-version:
-          - { full: 6.9.13-27, major-minor: '6.9' }
-          - { full: 7.1.2-1, major-minor: '7.1' }
+          - { full: 6.9.13-33, major-minor: '6.9' }
+          - { full: 7.1.2-8, major-minor: '7.1' }
 
     name: Linux, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -116,14 +116,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3', '3.4', '4.0.0-preview2']
         imagemagick-version:
-          - { full: 6.9.13-27, major-minor: '6.9' }
-          - { full: 7.1.2-1, major-minor: '7.1' }
+          - { full: 6.9.13-33, major-minor: '6.9' }
+          - { full: 7.1.2-8, major-minor: '7.1' }
 
     name: macOS, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Cache ImageMagick built objects
       uses: actions/cache@v4
       with:
@@ -151,14 +151,14 @@ jobs:
       matrix:
         ruby-version: ['3.4']
         imagemagick-version:
-          - { full: 6.9.13-27, major-minor: '6.9' }
-          - { full: 7.1.2-1, major-minor: '7.1' }
+          - { full: 6.9.13-33, major-minor: '6.9' }
+          - { full: 7.1.2-8, major-minor: '7.1' }
         os:
           - { target: windows-latest, arch: 'x64' }
           - { target: windows-11-arm, arch: 'arm64' }
         exclude:
           # ImageMagick 6 has not provided ARM binary. Ref. https://legacy.imagemagick.org/archive/binaries/
-          - imagemagick-version: { full: 6.9.13-27, major-minor: '6.9' }
+          - imagemagick-version: { full: 6.9.13-33, major-minor: '6.9' }
             os: { target: windows-11-arm, arch: 'arm64' }
 
     env:
@@ -167,7 +167,7 @@ jobs:
 
     name: MSWin ${{ matrix.os.arch }}, Ruby ${{ matrix.ruby-version }}, IM ${{ matrix.imagemagick-version.major-minor }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Setup environment variable
       # https://stackoverflow.com/questions/60169752/how-to-update-the-path-in-a-github-action-workflow-file-for-a-windows-latest-hos
       run: |

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 6.1.5
+
+Bug Fixes
+
+- Fix memory leak in Image#marshal_load (#1721)
+- Fix memory leak in Image::Info#page= (#1720)
+- Fix memory leak in Image::Info#view= with ImageMagick 7 (#1719)
+- Fix memory leak in Image::Info#authenticate= with ImageMagick 7 (#1718)
+- Fix memory leak in Image#marshal_load with invalid data (#1717)
+
 ## RMagick 6.1.4
 
 Improvements

data/Gemfile

@@ -20,3 +20,5 @@ gem 'rubocop-on-rbs', '~> 1.5' if Gem::Version.new(RUBY_VERSION) >= Gem::Version
 
 gem 'rbs', '~> 3.4'
 gem 'steep', '~> 1.6'
+
+gem 'ruby_memcheck', '~> 3.0' if RUBY_PLATFORM.include?('linux')

data/Rakefile

@@ -185,6 +185,14 @@ Rake::ExtensionTask.new('RMagick2') do |ext|
   ext.ext_dir = 'ext/RMagick'
 end
 
+if RUBY_PLATFORM.include?('linux')
+  require 'ruby_memcheck'
+  require 'ruby_memcheck/rspec/rake_task'
+  namespace :spec do
+    RubyMemcheck::RSpec::RakeTask.new(valgrind: :compile)
+  end
+end
+
 task spec: :compile
 
 if ENV['STYLE_CHECKS']

data/ext/RMagick/rmimage.cpp

@@ -9062,14 +9062,10 @@ Image_marshal_load(VALUE self, VALUE ary)
 {
     VALUE blob, filename;
     Info *info;
-    Image *image;
+    Image *image, *new_image;
     ExceptionInfo *exception;
 
-    info = CloneImageInfo(NULL);
-    if (!info)
-    {
-        rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
-    }
+    TypedData_Get_Struct(self, Image, &rm_image_data_type, image);
 
     filename = rb_ary_shift(ary);
     blob = rb_ary_shift(ary);
@@ -9077,20 +9073,27 @@ Image_marshal_load(VALUE self, VALUE ary)
     filename = StringValue(filename);
     blob = StringValue(blob);
 
+    info = CloneImageInfo(NULL);
+    if (!info)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
+    }
+
     exception = AcquireExceptionInfo();
     if (filename != Qnil)
     {
         strlcpy(info->filename, RSTRING_PTR(filename), sizeof(info->filename));
     }
     GVL_STRUCT_TYPE(BlobToImage) args = { info, RSTRING_PTR(blob), (size_t)RSTRING_LEN(blob), exception };
-    image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
+    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(BlobToImage), &args);
 
     // Destroy info before raising an exception
     DestroyImageInfo(info);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
 
-    UPDATE_DATA_PTR(self, image);
+    UPDATE_DATA_PTR(self, new_image);
+    rm_image_destroy(image);
 
     return self;
 }

data/ext/RMagick/rminfo.cpp

@@ -446,7 +446,7 @@ Info_authenticate_eq(VALUE self, VALUE passwd_arg)
     }
     else
     {
-        RemoveImageOption(info, "authenticate");
+        DeleteImageOption(info, "authenticate");
     }
 #else
     if (info->authenticate)
@@ -1750,6 +1750,8 @@ Info_page_eq(VALUE self, VALUE page_arg)
         info->page = NULL;
         return page_arg;
     }
+    magick_free(info->page);
+
     info->page = geometry;
 
     RB_GC_GUARD(geom_str);
@@ -2292,7 +2294,7 @@ Info_view_eq(VALUE self, VALUE view_arg)
     }
     else
     {
-        RemoveImageOption(info, "fpx:view");
+        DeleteImageOption(info, "fpx:view");
     }
 #else
     if (info->view)

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.1.4'
+  VERSION = '6.1.5'
   MIN_RUBY_VERSION = '3.0.0'
   MIN_IM_VERSION = '6.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.1.5
 platform: ruby
 authors:
 - Tim Hunter
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.8.9 or later
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby binding to ImageMagick
 test_files: []