Module Name: src
Committed By: rillig
Date: Sun Jul 19 18:35:54 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): fix double free introduced this morning in r1.258
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.269 src/usr.bin/make/var.c:1.270
--- src/usr.bin/make/var.c:1.269 Sun Jul 19 17:43:36 2020
+++ src/usr.bin/make/var.c Sun Jul 19 18:35:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.269 2020/07/19 17:43:36 rillig Exp $ */
+/* $NetBSD: var.c,v 1.270 2020/07/19 18:35:53 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.269 2020/07/19 17:43:36 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.270 2020/07/19 18:35:53 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: var.c,v 1.269 2020/07/19 17:43:36 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.270 2020/07/19 18:35:53 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -3042,7 +3042,7 @@ ApplyModifier_IfElse(ApplyModifiersState
free(else_expr);
} else {
st->newStr = else_expr;
- free(else_expr);
+ free(then_expr);
}
if (st->v->flags & VAR_JUNK)
st->v->flags |= VAR_KEEP;
