diff options
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/standalone.pm | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5a3572b3a..d50b945b7 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- distinct exceptions from segfaults, thus restoring catching SIGSEGV + and preventing looping while segfaulting again - fix loading of tifm_sd module (#18237) Version 10.4.193 - 13 September 2007, by Thierry Vignaud diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 62ff33c59..824ec46ed 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -190,13 +190,13 @@ our @builtin_functs = qw(chmod chown __exit exit unlink link symlink rename syst our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree any bootloader bootlook c commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::connection network::isdn_consts network::isdn network::modem network::netconnect network::network fs::remote::nfs fs::remote::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall); sub bug_handler { - my ($error) = @_; + my ($error, $is_signal) = @_; # exceptions in eval are OK: - return if $error && $^S; + return if $error && $^S && !$is_signal; # exceptions with "\n" are normal ways to quit: - if ($error eq MDK::Common::String::formatError($error)) { + if (!$is_signal && $error eq MDK::Common::String::formatError($error)) { warn $error; exit(255); } @@ -215,7 +215,7 @@ sub bug_handler { exec('drakbug', if_($error, '--error', $error), '--incident', $progname,); } -$SIG{SEGV} = \&bug_handler; +$SIG{SEGV} = sub { bug_handler(@_, 1) }; $SIG{__DIE__} = \&bug_handler; sub import() { |