admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Disallow nested ignore_interrupts.

Browse Source
This commit is contained in:
Markus Reiter 2024-07-14 13:36:43 -04:00
parent 3c8497647e
commit 27a70a40c2
No known key found for this signature in database
GPG Key ID: 245293B51702655B
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/extend/kernel.rb
View File

@ -353,13 +353,9 @@ module Kernel
def ignore_interrupts(quiet: false) def ignore_interrupts(quiet: false)
IGNORE_INTERRUPTS_MUTEX.synchronize do IGNORE_INTERRUPTS_MUTEX.synchronize do
# rubocop:disable Style/GlobalVars interrupted = false
$ignore_interrupts_nesting_level = 0 unless defined?($ignore_interrupts_nesting_level)
$ignore_interrupts_nesting_level += 1
$ignore_interrupts_interrupted = false unless defined?($ignore_interrupts_interrupted)
old_sigint_handler = trap(:INT) do old_sigint_handler = trap(:INT) do
$ignore_interrupts_interrupted = true interrupted = true
unless quiet unless quiet
$stderr.print "\n" $stderr.print "\n"
@ -372,14 +368,9 @@ module Kernel
ensure ensure
trap(:INT, old_sigint_handler) trap(:INT, old_sigint_handler)
$ignore_interrupts_nesting_level -= 1 raise Interrupt if interrupted
if $ignore_interrupts_nesting_level == 0 && $ignore_interrupts_interrupted
$ignore_interrupts_interrupted = false
raise Interrupt
end end
end end
# rubocop:enable Style/GlobalVars
end
end end
def redirect_stdout(file) def redirect_stdout(file)