Module Name: src
Committed By: riastradh
Date: Sun Apr 16 21:35:08 UTC 2017
Modified Files:
src/usr.bin/make: parse.c
Log Message:
Make it clearer that this is not a memory leak.
CID 978369
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.221 src/usr.bin/make/parse.c:1.222
--- src/usr.bin/make/parse.c:1.221 Sun Apr 16 21:03:13 2017
+++ src/usr.bin/make/parse.c Sun Apr 16 21:35:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.221 2017/04/16 21:03:13 riastradh Exp $ */
+/* $NetBSD: parse.c,v 1.222 2017/04/16 21:35:08 riastradh Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.221 2017/04/16 21:03:13 riastradh Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.222 2017/04/16 21:35:08 riastradh 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.221 2017/04/16 21:03:13 riastradh Exp $");
+__RCSID("$NetBSD: parse.c,v 1.222 2017/04/16 21:35:08 riastradh Exp $");
#endif
#endif /* not lint */
#endif
@@ -1678,10 +1678,12 @@ ParseDoDependency(char *line)
}
if (paths) {
Lst_Destroy(paths, NULL);
+ paths = NULL;
}
if (specType == ExPath)
Dir_SetPATH();
} else {
+ assert(paths == NULL);
while (*line) {
/*
* The targets take real sources, so we must beware of archive
@@ -1740,6 +1742,7 @@ ParseDoDependency(char *line)
}
out:
+ assert(paths == NULL);
if (curTargs)
Lst_Destroy(curTargs, NULL);
}
