svn commit: r289641 - stable/10/usr.bin/truss

[Bryan Drewery]

Author: bdrewery
Date: Tue Oct 20 18:35:52 2015
New Revision: 289641
URL: https://svnweb.freebsd.org/changeset/base/289641

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/10/usr.bin/truss/setup.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/truss/setup.c
==============================================================================
--- stable/10/usr.bin/truss/setup.c	Tue Oct 20 18:23:44 2015	(r289640)
+++ stable/10/usr.bin/truss/setup.c	Tue Oct 20 18:35:52 2015	(r289641)
@@ -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);