Fix Fiddle::Handle.new for a missing library in the FFI backend (#156)

eregon · web-flow · commit eea9fd0cc450 · 2024-10-18T21:52:56.000+09:00
* From ruby/reline#766 (comment)
diff --git a/lib/fiddle/ffi_backend.rb b/lib/fiddle/ffi_backend.rb
@@ -475,8 +475,11 @@ 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
+ begin
+ @lib = FFI::DynamicLibrary.open(libname, flags)
+ rescue LoadError, RuntimeError # LoadError for JRuby, RuntimeError for TruffleRuby
+ 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")

-Original file line number
+Diff line change
 RTLD_NOW=FFI::DynamicLibrary::RTLD_NOW
 definitialize(libname=nil,flags=RTLD_LAZY | RTLD_GLOBAL)
 -@lib=FFI::DynamicLibrary.open(libname,flags)rescueLoadError
 -raiseDLError.new("Could not open #{libname}")unless@lib
 +begin
 +@lib=FFI::DynamicLibrary.open(libname,flags)
 +rescueLoadError,RuntimeError# LoadError for JRuby, RuntimeError for TruffleRuby
 +raiseDLError,"Could not open #{libname}"
 +end
 @open=true
-Original file line number
+Diff line change
 classTestHandle < TestCase
 includeFiddle
 +deftest_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
++
 deftest_to_i
 ifffi_backend?
 omit("Fiddle::Handle#to_i is unavailable with FFI backend")