Fix Fiddle::Handle.new for a missing library in the FFI backend

* From ruby/reline#766 (comment)
ruby · Oct 18, 2024 · 06f7d08 · 06f7d08
1 parent 1f818e4
commit 06f7d08
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/fiddle/ffi_backend.rb b/lib/fiddle/ffi_backend.rb
@@ -475,8 +475,12 @@ class Handle
     RTLD_NOW = FFI::DynamicLibrary::RTLD_NOW
 
     def initialize(libname = nil, flags = RTLD_LAZY | RTLD_GLOBAL)
-      @lib = FFI::DynamicLibrary.open(libname, flags) rescue LoadError
-      raise DLError.new("Could not open #{libname}") unless @lib
+      @lib =
+        begin
+          FFI::DynamicLibrary.open(libname, flags)
+        rescue
+          raise DLError, "Could not open #{libname}"
+        end
 
       @open = true
 

diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
@@ -8,6 +8,15 @@ module Fiddle
   class TestHandle < TestCase
     include Fiddle
 
+    def test_library_unavailable
+      assert_raise(DLError) do
+        Fiddle::Handle.new("does-not-exist-library")
+      end
+      assert_raise(DLError) do
+        Fiddle::Handle.new("/does/not/exist/library.#{RbConfig::CONFIG['SOEXT']}")
+      end
+    end
+
     def test_to_i
       if ffi_backend?
         omit("Fiddle::Handle#to_i is unavailable with FFI backend")