[src/trunk]: src/usr.bin/make Check for meta file corruption earlier and more...

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

details:   https://anonhg.NetBSD.org/src/rev/be4b05a01ac7
branches:  trunk
changeset: 745987:be4b05a01ac7
user:      sjg <sjg%NetBSD.org@localhost>
date:      Wed Mar 18 23:53:02 2020 +0000

description:
Check for meta file corruption earlier and more often.

diffstat:

 usr.bin/make/meta.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r baacb9d5729d -r be4b05a01ac7 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Wed Mar 18 19:34:15 2020 +0000
+++ b/usr.bin/make/meta.c       Wed Mar 18 23:53:02 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: meta.c,v 1.79 2020/02/12 16:50:37 sjg Exp $ */
+/*      $NetBSD: meta.c,v 1.80 2020/03/18 23:53:02 sjg Exp $ */
 
 /*
  * Implement 'meta' mode.
@@ -1558,6 +1558,7 @@
                        if (buf[x - 1] == '\n')
                            buf[x - 1] = '\0';
                    }
+                   CHECK_VALID_META(p);
                    if (!hasOODATE &&
                        !(gn->type & OP_NOMETA_CMP) &&
                        strcmp(p, cmd) != 0) {
@@ -1579,6 +1580,7 @@
                        fprintf(debug_file, "%s: %d: there are extra build commands now that weren't in the meta data file\n", fname, lineno);
                    oodate = TRUE;
                }
+               CHECK_VALID_META(p);
                if (strcmp(p, cwd) != 0) {
                    if (DEBUG(META))
                        fprintf(debug_file, "%s: %d: the current working directory has changed from '%s' to '%s'\n", fname, lineno, p, curdir);