Module Name: src
Committed By: rillig
Date: Sun Dec 20 15:04:29 UTC 2020
Modified Files:
src/usr.bin/make: var.c
Log Message:
make(1): fix memory leak in Var_Delete (since yesterday)
The memory leak had been introduced in var.c 1.736 from 2020-12-19
20:47:24.
To generate a diff of this commit:
cvs rdiff -u -r1.745 -r1.746 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.745 src/usr.bin/make/var.c:1.746
--- src/usr.bin/make/var.c:1.745 Sun Dec 20 14:32:13 2020
+++ src/usr.bin/make/var.c Sun Dec 20 15:04:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.745 2020/12/20 14:32:13 rillig Exp $ */
+/* $NetBSD: var.c,v 1.746 2020/12/20 15:04:29 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -131,7 +131,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.745 2020/12/20 14:32:13 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.746 2020/12/20 15:04:29 rillig Exp $");
typedef enum VarFlags {
VAR_NONE = 0,
@@ -498,15 +498,18 @@ Var_DeleteVar(const char *varname, GNode
void
Var_Delete(const char *name, GNode *ctxt)
{
- char *name_freeIt = NULL;
+ FStr varname = FStr_InitRefer(name);
- if (strchr(name, '$') != NULL) {
- (void)Var_Subst(name, VAR_GLOBAL, VARE_WANTRES, &name_freeIt);
+ if (strchr(varname.str, '$') != NULL) {
+ char *expanded;
+ (void)Var_Subst(varname.str, VAR_GLOBAL, VARE_WANTRES,
+ &expanded);
/* TODO: handle errors */
- name = name_freeIt;
+ varname = FStr_InitOwn(expanded);
}
- Var_DeleteVar(name, ctxt);
+ Var_DeleteVar(varname.str, ctxt);
+ FStr_Done(&varname);
}
/*
