Author: bdrewery
Date: Tue Oct 20 18:37:42 2015
New Revision: 289642
URL: https://svnweb.freebsd.org/changeset/base/289642

Log:
  MFC r288903:
  
    Fix crash if a process sends itself a SIGTRAP.  Just forward it as expected.
  
    This does not match head as the code was rewritten significantly there.
  
  Relnotes:     yes

Modified:
  stable/9/usr.bin/truss/setup.c
Directory Properties:
  stable/9/usr.bin/truss/   (props changed)

Modified: stable/9/usr.bin/truss/setup.c
==============================================================================
--- stable/9/usr.bin/truss/setup.c      Tue Oct 20 18:35:52 2015        
(r289641)
+++ stable/9/usr.bin/truss/setup.c      Tue Oct 20 18:37:42 2015        
(r289642)
@@ -221,11 +221,9 @@ detach:
                                info->pr_why = S_SCX;
                                info->curthread->in_syscall = 0;
                                break;
-                       } else {
-                               errx(1,
-                  "pl_flags %x contains neither PL_FLAG_SCE nor PL_FLAG_SCX",
-                                   lwpinfo.pl_flags);
                        }
+                       /* We didn't send the SIGTRAP, just forward it. */
+                       /* FALLTHROUGH */
                default:
                        info->pr_why = S_SIG;
                        info->pr_data = WSTOPSIG(waitval);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to