sqlite3-ffi 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18966e30363b64785e729d7083ee0595f4041adf38ef397c1ab537d3df2f4915
-  data.tar.gz: 5dcbab4cf2535a6b8b562eeaa91179728a147f38ef2309e028a508189afcbb0f
+  metadata.gz: '0099c7235d3e7b13c26861041a474d279952101488139c9b11c40053658bb095'
+  data.tar.gz: e809f4772c73162b7417c79ae56674606c689e2a1fddb3181ac637d958066f04
 SHA512:
-  metadata.gz: 2e91e7e66411e91ccc35c6b1d2525f0f766bf7893200db4db9b6ea8ed9647c22a39756649abf9f429e0c4d13dd3b717d4d733b46c5ef3ac24062174717a5452b
-  data.tar.gz: bb42912806d022e3e5ffcc7b11c0ef18a81d2545191da9cd30e90ad05e46f697c9d2c8e915419911b4a42264cd801866a2be74ed55f68dadec06a6c900733181
+  metadata.gz: 916507cb952494f227d6182cf92d9e910cf3534f01995706efff64523eb86750fe7601238b9e4d6c32813cff3a097a073b541bad0632dc74f87e2b35e589ccca
+  data.tar.gz: 78586b3eb030fdcb58e4afbcace803efcf78c3e02d3939d73524186148f55cc6b7699c5f15b42df774f6007681ac22bbf82a434887874b1092b3a72ec66efadf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.7 (2026-06-07)
+
+- Synced with sqlite3-ruby 2.9.5
+- Fixed [GHSA-28hh-pr2h-2w89](https://github.com/sparklemotion/sqlite3-ruby/security/advisories/GHSA-28hh-pr2h-2w89) and [GHSA-j7fr-3v8c-3qc3](https://github.com/sparklemotion/sqlite3-ruby/security/advisories/GHSA-j7fr-3v8c-3qc3)
+
+## 0.1.6 (2026-02-19)
+
+- Fixed memory leaks
+
 ## 0.1.5 (2026-01-02)
 
 - Synced with sqlite3-ruby 2.9.0

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2004-2024, Jamis Buck, Luis Lavena, Aaron Patterson, Mike Dalessio, et al.
-Copyright (c) 2025, Andrew Kane.
+Copyright (c) 2025-2026, Andrew Kane.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted
 provided that the following conditions are met:

data/lib/sqlite3/database.rb

@@ -175,7 +175,7 @@ module SQLite3
       @authorizer = nil
       @progress_handler = nil
       @collations = {}
-      @functions = {}
+      @functions = []
       @results_as_hash = options[:results_as_hash]
       @readonly = mode & Constants::Open::READONLY != 0
       @default_transaction_mode = options[:default_transaction_mode] || :deferred
@@ -398,6 +398,8 @@ module SQLite3
     # the FunctionProxy#result= method on the +func+ parameter and
     # indicate the return value that way.
     #
+    # A reference to the block will be kept for the lifetime of the database object.
+    #
     # Example:
     #
     #   db.create_function( "maim", 1 ) do |func, value|
@@ -437,6 +439,8 @@ module SQLite3
     # function invocation. It should invoke FunctionProxy#result= to
     # store the result of the function.
     #
+    # A reference to the block will be kept for the lifetime of the database object.
+    #
     # Example:
     #
     #   db.create_aggregate( "lengths", 1 ) do

data/lib/sqlite3/ffi/c_api.rb

@@ -129,6 +129,9 @@ module SQLite3
       SQLITE_TRACE_ROW     = 0x04
       SQLITE_TRACE_CLOSE   = 0x08
 
+      SQLITE_FCNTL_FILE_POINTER    = 7
+      SQLITE_FCNTL_JOURNAL_POINTER = 28
+
       attach_function :sqlite3_aggregate_context, [:pointer, :int], :pointer
       attach_function :sqlite3_backup_finish, [:pointer], :int
       attach_function :sqlite3_backup_init, [:pointer, :string, :pointer, :string], :pointer
@@ -169,9 +172,9 @@ module SQLite3
       attach_function :sqlite3_errmsg, [:pointer], :string
       attach_function :sqlite3_error_offset, [:pointer], :int
       attach_function :sqlite3_exec, [:pointer, :string, :pointer, :pointer, :pointer], :int
-      attach_function :sqlite3_expanded_sql, [:pointer], :string
+      attach_function :sqlite3_expanded_sql, [:pointer], :pointer
       attach_function :sqlite3_extended_result_codes, [:pointer, :int], :int
-      attach_function :sqlite3_file_control, [:pointer, :string, :int, :pointer], :int
+      attach_function :sqlite3_file_control, [:pointer, :pointer, :int, :pointer], :int
       attach_function :sqlite3_finalize, [:pointer], :int
       attach_function :sqlite3_free, [:pointer], :void
       attach_function :sqlite3_get_autocommit, [:pointer], :int
@@ -205,6 +208,13 @@ module SQLite3
       attach_function :sqlite3_value_text, [:pointer], :pointer
       attach_function :sqlite3_value_type, [:pointer], :int
 
+      HAVE_SQLITE3_DB_NAME = begin
+        attach_function :sqlite3_db_name, [:pointer, :int], :pointer
+        true
+      rescue ::FFI::NotFoundError
+        false
+      end
+
       HAVE_SQLITE3_ENABLE_LOAD_EXTENSION = begin
         attach_function :sqlite3_enable_load_extension, [:pointer, :int], :int
         true

data/lib/sqlite3/ffi/database.rb

@@ -2,7 +2,6 @@ module SQLite3
   class Database
     def close
       close_or_discard_db
-      @aggregators = nil
       self
     end
 
@@ -53,7 +52,7 @@ module SQLite3
 
       status = FFI::CApi.sqlite3_create_function(@db, FFI.string_value(name), block.arity, flags, FFI.wrap(block), FFI::FUNC, nil, nil)
       FFI.check(@db, status)
-      @functions[name] = block
+      @functions << block
       self
     end
 
@@ -169,8 +168,31 @@ module SQLite3
     end
 
     def discard_db
+      sfile = ::FFI::MemoryPointer.new(:pointer)
+
       FFI::CApi.sqlite3_db_release_memory(@db)
-      # TODO sqlite3_file_control
+
+      if FFI::CApi::HAVE_SQLITE3_DB_NAME
+        j_db = 0
+        while !(db_name = FFI::CApi.sqlite3_db_name(@db, j_db)).null?
+          status = FFI::CApi.sqlite3_file_control(@db, db_name, FFI::CApi::SQLITE_FCNTL_FILE_POINTER, sfile)
+          if status == 0
+            # TODO
+          end
+          j_db += 1
+        end
+      else
+        status = FFI::CApi.sqlite3_file_control(@db, nil, FFI::CApi::SQLITE_FCNTL_FILE_POINTER, sfile)
+        if status == 0
+          # TODO
+        end
+      end
+
+      status = FFI::CApi.sqlite3_file_control(@db, nil, FFI::CApi::SQLITE_FCNTL_JOURNAL_POINTER, sfile)
+      if status == 0
+        # TODO
+      end
+
       @db = nil
       @discarded = true
     end
@@ -178,7 +200,7 @@ module SQLite3
     def close_or_discard_db
       unless @db.nil?
         if @readonly || @owner == Process.pid
-          FFI::CApi.sqlite3_close_v2(@db)
+          @db.free
           @db = nil
         else
           discard_db
@@ -191,14 +213,15 @@ module SQLite3
     end
 
     def open_v2(file, flags, zvfs)
+      @owner = Process.pid
       db = ::FFI::MemoryPointer.new(:pointer)
       status = FFI::CApi.sqlite3_open_v2(FFI.string_value(file), db, flags, zvfs)
       @db = db.read_pointer
+      @db = ::FFI::AutoPointer.new(db.read_pointer, FFI::CApi.method(:sqlite3_close_v2))
       FFI.check(@db, status)
       if (flags & FFI::CApi::SQLITE_OPEN_READONLY) != 0
         @readonly = true
       end
-      @owner = Process.pid
       self
     end
 
@@ -212,7 +235,6 @@ module SQLite3
 
     def discard
       discard_db
-      @aggregators = nil
       self
     end
 
@@ -228,9 +250,10 @@ module SQLite3
     end
 
     def open16(file)
+      @owner = Process.pid
       db = ::FFI::MemoryPointer.new(:pointer)
       status = FFI::CApi.sqlite3_open16(utf16_string_value_ptr(file), db)
-      @db = db.read_pointer
+      @db = ::FFI::AutoPointer.new(db.read_pointer, FFI::CApi.method(:sqlite3_close_v2))
       FFI.check(@db, status)
       status
     end

data/lib/sqlite3/ffi/statement.rb

@@ -10,7 +10,7 @@ module SQLite3
       status = FFI::CApi.sqlite3_prepare_v2(db, sql, sql.bytesize, stmt, tail)
       FFI.check_prepare(db, status, sql)
 
-      @stmt = stmt.read_pointer
+      @stmt = ::FFI::AutoPointer.new(stmt.read_pointer, FFI::CApi.method(:sqlite3_finalize))
       @db.instance_variable_set(:@stmt_deadline, nil)
 
       tail.read_pointer.read_string.force_encoding(Encoding::UTF_8)
@@ -19,7 +19,7 @@ module SQLite3
     def close
       require_open_stmt
 
-      FFI::CApi.sqlite3_finalize(@stmt)
+      @stmt.free
       @stmt = nil
     end
 
@@ -239,7 +239,11 @@ module SQLite3
       require_live_db
       require_open_stmt
 
-      FFI::CApi.sqlite3_expanded_sql(@stmt).force_encoding(Encoding::UTF_8).freeze
+      expanded_sql = FFI::CApi.sqlite3_expanded_sql(@stmt)
+      rb_expanded_sql = expanded_sql.read_string.force_encoding(Encoding::UTF_8).freeze
+      FFI::CApi.sqlite3_free(expanded_sql)
+
+      rb_expanded_sql
     end
 
     private

data/lib/sqlite3/ffi/version.rb

@@ -1,5 +1,5 @@
 module SQLite3
   module FFI
-    VERSION = "0.1.5"
+    VERSION = "0.1.7"
   end
 end

data/lib/sqlite3/version.rb

@@ -1,4 +1,4 @@
 module SQLite3
   # (String) the version of the sqlite3 gem, e.g. "2.1.1"
-  VERSION = "2.9.0"
+  VERSION = "2.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlite3-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Jamis Buck
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.13
 specification_version: 4
 summary: A drop-in replacement for the sqlite3 gem for JRuby
 test_files: []