[src/trunk]: src/usr.bin/make Do not assume safe to pass NULL to realpath(3).

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

details:   https://anonhg.NetBSD.org/src/rev/96c2d020a0b5
branches:  trunk
changeset: 965679:96c2d020a0b5
user:      sjg <sjg%NetBSD.org@localhost>
date:      Thu Sep 26 21:09:55 2019 +0000

description:
Do not assume safe to pass NULL to realpath(3).

PR: 54574
Reviewed by: buhrow

diffstat:

 usr.bin/make/parse.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 4290b12608e0 -r 96c2d020a0b5 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Thu Sep 26 20:57:19 2019 +0000
+++ b/usr.bin/make/parse.c      Thu Sep 26 21:09:55 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.232 2019/04/09 18:28:10 sjg Exp $  */
+/*     $NetBSD: parse.c,v 1.233 2019/09/26 21:09:55 sjg Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.232 2019/04/09 18:28:10 sjg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.233 2019/09/26 21:09:55 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c    8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.232 2019/04/09 18:28:10 sjg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.233 2019/09/26 21:09:55 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -670,6 +670,7 @@
     const char *fmt, va_list ap)
 {
        static Boolean fatal_warning_error_printed = FALSE;
+       char dirbuf[MAXPATHLEN+1];
 
        (void)fprintf(f, "%s: ", progname);
 
@@ -688,9 +689,7 @@
                        if (dir == NULL)
                                dir = ".";
                        if (*dir != '/') {
-                               dir = cp2 = realpath(dir, NULL);
-                               free(cp);
-                               cp = cp2; /* cp2 set to NULL by Var_Value */
+                               dir = realpath(dir, dirbuf);
                        }
                        fname = Var_Value(".PARSEFILE", VAR_GLOBAL, &cp2);
                        if (fname == NULL) {