[src/trunk]: src/usr.bin/make PR: 51405

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74fc5727f760
branches:  trunk
changeset: 817197:74fc5727f760
user:      sjg <sjg%NetBSD.org@localhost>
date:      Thu Aug 11 19:53:17 2016 +0000

description:
PR: 51405
Description:

addErrorCMD: in compat mode, cmdp may be NULL, skip it
and stop the calls (return 1).

diffstat:

 usr.bin/make/main.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 6f1f1c3e18e6 -r 74fc5727f760 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Thu Aug 11 15:45:39 2016 +0000
+++ b/usr.bin/make/main.c       Thu Aug 11 19:53:17 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.249 2016/08/10 23:49:12 sjg Exp $   */
+/*     $NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.249 2016/08/10 23:49:12 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.249 2016/08/10 23:49:12 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.250 2016/08/11 19:53:17 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1892,6 +1892,8 @@
 static int
 addErrorCMD(void *cmdp, void *gnp)
 {
+    if (cmdp == NULL)
+       return 1;                       /* stop */
     Var_Append(".ERROR_CMD", cmdp, VAR_GLOBAL);
     return 0;
 }