diff options
Diffstat (limited to 'test/fiddle')
| -rw-r--r-- | test/fiddle/test_func.rb | 10 | ||||
| -rw-r--r-- | test/fiddle/test_handle.rb | 18 |
2 files changed, 15 insertions, 13 deletions
diff --git a/test/fiddle/test_func.rb b/test/fiddle/test_func.rb index 8517965223..8c35833a32 100644 --- a/test/fiddle/test_func.rb +++ b/test/fiddle/test_func.rb @@ -13,12 +13,12 @@ module Fiddle def test_syscall_with_tainted_string f = Function.new(@libc['system'], [TYPE_VOIDP], TYPE_INT) - assert_raise(SecurityError) do - Thread.new { - $SAFE = 1 + Thread.new { + $SAFE = 1 + assert_raise(SecurityError) do f.call("uname -rs".dup.taint) - }.join - end + end + }.join end def test_sinf diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb index 444ac55da3..77559eb4d9 100644 --- a/test/fiddle/test_handle.rb +++ b/test/fiddle/test_handle.rb @@ -9,20 +9,22 @@ module Fiddle include Fiddle def test_safe_handle_open - t = Thread.new do + Thread.new do $SAFE = 1 - Fiddle::Handle.new(LIBC_SO.dup.taint) - end - assert_raise(SecurityError) { t.value } + assert_raise(SecurityError) { + Fiddle::Handle.new(LIBC_SO.dup.taint) + } + end.join end def test_safe_function_lookup - t = Thread.new do + Thread.new do h = Fiddle::Handle.new(LIBC_SO) $SAFE = 1 - h["qsort".dup.taint] - end - assert_raise(SecurityError) { t.value } + assert_raise(SecurityError) { + h["qsort".dup.taint] + } + end.join end def test_to_i |