From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jan 20 14:22:22 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3A10E8E5;
 Sun, 20 Jan 2013 14:22:22 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 118F3678;
 Sun, 20 Jan 2013 14:22:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0KEMLr6097065;
 Sun, 20 Jan 2013 14:22:21 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0KEMLLe097063;
 Sun, 20 Jan 2013 14:22:21 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201301201422.r0KEMLLe097063@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 20 Jan 2013 14:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r245690 - in stable/9: bin/sh
 tools/regression/bin/sh/parser
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jan 2013 14:22:22 -0000

Author: jilles
Date: Sun Jan 20 14:22:21 2013
New Revision: 245690
URL: http://svnweb.freebsd.org/changeset/base/245690

Log:
  MFC r245382: sh: Fix crash when parsing '{ } &'.

Added:
  stable/9/tools/regression/bin/sh/parser/empty-braces1.0
     - copied unchanged from r245382, head/tools/regression/bin/sh/parser/empty-braces1.0
Modified:
  stable/9/bin/sh/parser.c
Directory Properties:
  stable/9/bin/sh/   (props changed)
  stable/9/tools/regression/bin/sh/   (props changed)

Modified: stable/9/bin/sh/parser.c
==============================================================================
--- stable/9/bin/sh/parser.c	Sun Jan 20 12:44:50 2013	(r245689)
+++ stable/9/bin/sh/parser.c	Sun Jan 20 14:22:21 2013	(r245690)
@@ -240,9 +240,9 @@ list(int nlflag, int erflag)
 		n2 = andor();
 		tok = readtoken();
 		if (tok == TBACKGND) {
-			if (n2->type == NPIPE) {
+			if (n2 != NULL && n2->type == NPIPE) {
 				n2->npipe.backgnd = 1;
-			} else if (n2->type == NREDIR) {
+			} else if (n2 != NULL && n2->type == NREDIR) {
 				n2->type = NBACKGND;
 			} else {
 				n3 = (union node *)stalloc(sizeof (struct nredir));

Copied: stable/9/tools/regression/bin/sh/parser/empty-braces1.0 (from r245382, head/tools/regression/bin/sh/parser/empty-braces1.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/tools/regression/bin/sh/parser/empty-braces1.0	Sun Jan 20 14:22:21 2013	(r245690, copy of r245382, head/tools/regression/bin/sh/parser/empty-braces1.0)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+# Unfortunately, some scripts depend on the extension of allowing an empty
+# pair of braces.
+
+{ } &
+wait $!