Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src/bin/sh Pull up following revision(s) (requested by kre in...



details:   https://anonhg.NetBSD.org/src/rev/2ac8a0ab7786
branches:  netbsd-7
changeset: 446557:2ac8a0ab7786
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 10 17:20:03 2018 +0000

description:
Pull up following revision(s) (requested by kre in ticket #1663):

        bin/sh/parser.c: revision 1.152 (via patch)

PR bin/53712

Avoid crash from redirect on null compound command.

diffstat:

 bin/sh/parser.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b7daf8e5983c -r 2ac8a0ab7786 bin/sh/parser.c
--- a/bin/sh/parser.c   Tue Dec 04 19:17:00 2018 +0000
+++ b/bin/sh/parser.c   Mon Dec 10 17:20:03 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parser.c,v 1.90.4.1 2016/08/27 15:20:48 bouyer Exp $   */
+/*     $NetBSD: parser.c,v 1.90.4.2 2018/12/10 17:20:03 martin Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c   8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.90.4.1 2016/08/27 15:20:48 bouyer Exp $");
+__RCSID("$NetBSD: parser.c,v 1.90.4.2 2018/12/10 17:20:03 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -528,7 +528,7 @@
        tokpushback++;
        *rpp = NULL;
        if (redir) {
-               if (n1->type != NSUBSHELL) {
+               if (n1 == NULL || n1->type != NSUBSHELL) {
                        n2 = (union node *)stalloc(sizeof (struct nredir));
                        n2->type = NREDIR;
                        n2->nredir.n = n1;



Home | Main Index | Thread Index | Old Index