tiny_tds 3.4.0-x86_64-linux-gnu → 3.4.1-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e35fd3530562d904fb546b7e42316bf07985dced0fae8580bcd6ea546f2a341
-  data.tar.gz: f5862f9b6af4442d0287f4ba8602e13f55f44e0fa6eca0c7c64b4e6109a2c09b
+  metadata.gz: 0fb974568785447c7f854ac2c096cd52d402379cffc2fd006968d2993d7f8325
+  data.tar.gz: d061b95f9d523afc4f4240167427f126fe95bd786a27d651245c19219a065985
 SHA512:
-  metadata.gz: 12380310bd3ec7cc9966741c6fa991bc0068e35d5bda38168c247ff72ad8e6b04affb72a6f9162fe8cf1fcbbb667f403ec30801bdf9b1b78308b268c777dbbc3
-  data.tar.gz: 4559b68cd048cee80174006624269679e949c403dba79c0fc59d7aacc574d84d4321d07cca0c6eb3e4ba219d52076a7ad8ae166b2e6e1cad801e384e9921a853
+  metadata.gz: ed66f184d8894af0e2061a142e67f9dd3e9e3ae00bcc28af6b0112b6c838dcfa97d34a8caef801eb07fa494e9c8de17fe9f3fe422e01e8604fbed1b7bc0926bc
+  data.tar.gz: d1bb510afb9492a12be593372f0d45355abcdaa4c3c6891e14ea16b1730b504861b75690349db8ea9fe1db6f19f323c6a2aed3fd9c54237bfd87086d0b44b96e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## (unreleased)
 
+## 3.4.1
+
+* Register the C globals that hold Ruby classes and modules with the GC, so raising `TinyTds::Error` after GC compaction no longer crashes with a segmentation fault. Fixes #608.
+* Use freetds v1.5.19 and OpenSSL v3.6.5 for Windows and Linux builds.
+
 ## 3.4.0
 
 * Add Ruby 4.0 to the cross compile list

data/VERSION

@@ -1 +1 @@
-3.4.0
+3.4.1

data/ext/tiny_tds/client.c

@@ -541,6 +541,7 @@ static VALUE rb_tinytds_connect(VALUE self, VALUE opts)
 void init_tinytds_client()
 {
   cTinyTdsClient = rb_define_class_under(mTinyTds, "Client", rb_cObject);
+  rb_global_variable(&cTinyTdsClient);
   rb_define_alloc_func(cTinyTdsClient, allocate);
   /* Define TinyTds::Client Public Methods */
   rb_define_method(cTinyTdsClient, "tds_version", rb_tinytds_tds_version, 0);

data/ext/tiny_tds/extconsts.rb

@@ -1,8 +1,8 @@
 ICONV_VERSION = ENV["TINYTDS_ICONV_VERSION"] || "1.18"
 ICONV_SOURCE_URI = "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
-OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.6.0"
+OPENSSL_VERSION = ENV["TINYTDS_OPENSSL_VERSION"] || "3.6.5"
 OPENSSL_SOURCE_URI = "https://www.openssl.org/source/openssl-#{OPENSSL_VERSION}.tar.gz"
 
-FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.10"
+FREETDS_VERSION = ENV["TINYTDS_FREETDS_VERSION"] || "1.5.19"
 FREETDS_SOURCE_URI = "http://www.freetds.org/files/stable/freetds-#{FREETDS_VERSION}.tar.bz2"

data/ext/tiny_tds/result.c

@@ -702,9 +702,12 @@ void init_tinytds_result()
 {
   /* Data Classes */
   cKernel = rb_const_get(rb_cObject, rb_intern("Kernel"));
+  rb_global_variable(&cKernel);
   cDate = rb_const_get(rb_cObject, rb_intern("Date"));
+  rb_global_variable(&cDate);
   /* Define TinyTds::Result */
   cTinyTdsResult = rb_define_class_under(mTinyTds, "Result", rb_cObject);
+  rb_global_variable(&cTinyTdsResult);
   rb_undef_alloc_func(cTinyTdsResult);
   /* Define TinyTds::Result Public Methods */
   rb_define_method(cTinyTdsResult, "fields", rb_tinytds_result_fields, 0);

data/ext/tiny_tds/tiny_tds_ext.c

@@ -8,8 +8,10 @@ VALUE mTinyTds, cTinyTdsError;
 
 void Init_tiny_tds()
 {
-  mTinyTds      = rb_define_module("TinyTds");
+  mTinyTds = rb_define_module("TinyTds");
+  rb_global_variable(&mTinyTds);
   cTinyTdsError = rb_const_get(mTinyTds, rb_intern("Error"));
+  rb_global_variable(&cTinyTdsError);
   init_tinytds_client();
   init_tinytds_result();
 }

data/test/gc_compaction_test.rb

@@ -0,0 +1,37 @@
+require "test_helper"
+require "open3"
+require "rbconfig"
+
+class GcCompactionTest < Minitest::Spec
+  describe "after GC compaction" do
+    it "raises TinyTds::Error instead of crashing when a connection fails" do
+      skip "GC compaction is not supported on this platform" if !GC.respond_to?(:verify_compaction_references)
+
+      # Ruby 3.2 renamed the double_heap: keyword to expand_heap:
+      heap_keyword =
+        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2")
+          "expand_heap"
+        else
+          "double_heap"
+        end
+
+      script = <<~RUBY
+        require "tiny_tds"
+
+        GC.verify_compaction_references(#{heap_keyword}: true, toward: :empty)
+
+        begin
+          TinyTds::Client.new(host: "127.0.0.1", port: 1, username: "unused", password: "unused", login_timeout: 1)
+        rescue TinyTds::Error
+          exit 0
+        end
+
+        exit 1
+      RUBY
+
+      output, status = Open3.capture2e(RbConfig.ruby, "-I", File.expand_path("../lib", __dir__), "-e", script)
+
+      assert status.success?, "expected TinyTds::Error to be raised, got #{status.inspect}:\n#{output}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tiny_tds
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: x86_64-linux-gnu
 authors:
 - Ken Collins
@@ -245,6 +245,7 @@ files:
 - test/bin/install-freetds.sh
 - test/bin/restore-from-native-gem.ps1
 - test/client_test.rb
+- test/gc_compaction_test.rb
 - test/gem_test.rb
 - test/result_test.rb
 - test/schema/1px.gif