summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-08 04:47:58 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-08 04:48:13 +0100
commit571aeab77c9d52375d061f53a729b3910f40e876 (patch)
treec122c9c43f27c95aecaf30cc2d8c63d8376eeaf5
parent58d6d233f61a1ba056c71aee344a7b0a93124418 (diff)
downloaddrakx-net-571aeab77c9d52375d061f53a729b3910f40e876.tar
drakx-net-571aeab77c9d52375d061f53a729b3910f40e876.tar.gz
drakx-net-571aeab77c9d52375d061f53a729b3910f40e876.tar.bz2
drakx-net-571aeab77c9d52375d061f53a729b3910f40e876.tar.xz
drakx-net-571aeab77c9d52375d061f53a729b3910f40e876.zip
delay setting SIG_CHLD handler
thus preventing potential segfault on startup (mga#10289)
-rw-r--r--NEWS3
-rwxr-xr-xbin/net_applet2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 2d7d928..4da66bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- delay setting SIG_CHLD handler
+ (thus preventing potential segfault on startup (mga#10289))
+
2.8
- nuke the use of /etc/iftab (it's no longer useful) mga#11592
- nuke the use of udev rules for network device names (persistent device names
diff --git a/bin/net_applet b/bin/net_applet
index 737d0d3..b8201f5 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -275,7 +275,7 @@ $SIG{USR1} = sub {
};
# do not create zombies (#20552)
-$SIG{CHLD} = \&harvester;
+Glib::Timeout->add_seconds(1, sub { $SIG{CHLD} = \&harvester; 0; });
sub harvester {
my $pid;
do {