From: Julian Seward <jseward@acm.org>
Date: Fri, 28 Jun 2002 02:08:28 +0000 (+0000)
Subject: Make --stop-after= work again.
X-Git-Tag: svn/VALGRIND_1_0_3~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3c3b1e909544ac7bedf858a0864cafa5cbd5e76;p=thirdparty%2Fvalgrind.git

Make --stop-after= work again.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@475
---

diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 00818738f7..3dce4d8dec 100644
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -1495,10 +1495,10 @@ void VG_(sigshutdown_actions) ( void )
          VG_(printf)("restoring handler 0x%x for signal %d\n", 
                      (Addr)(sa.ksa_handler), i );
 
-      /* Get the old host action */
+      /* Set the old host action */
       ret = VG_(ksigaction)(i, &sa, NULL);
-      vg_assert(ret == 0);
-
+      if (i != VKI_SIGKILL && i != VKI_SIGSTOP) 
+         vg_assert(ret == 0);
    }
 
    /* Restore the sig alt stack. */
diff --git a/vg_signals.c b/vg_signals.c
index 00818738f7..3dce4d8dec 100644
--- a/vg_signals.c
+++ b/vg_signals.c
@@ -1495,10 +1495,10 @@ void VG_(sigshutdown_actions) ( void )
          VG_(printf)("restoring handler 0x%x for signal %d\n", 
                      (Addr)(sa.ksa_handler), i );
 
-      /* Get the old host action */
+      /* Set the old host action */
       ret = VG_(ksigaction)(i, &sa, NULL);
-      vg_assert(ret == 0);
-
+      if (i != VKI_SIGKILL && i != VKI_SIGSTOP) 
+         vg_assert(ret == 0);
    }
 
    /* Restore the sig alt stack. */