Sun Dec 20 14:52:16 2020 UTC ()

make(1): clean up memory handling in VarAssign_EvalShell


(rillig)

diff -r1.506 -r1.507 src/usr.bin/make/parse.c

--- src/usr.bin/make/parse.c 2020/12/20 14:48:35	1.506
+++ src/usr.bin/make/parse.c 2020/12/20 14:52:16	1.507

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.506 2020/12/20 14:48:35 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.507 2020/12/20 14:52:16 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -107,27 +107,27 @@
 #ifndef MAP_FILE
 #define MAP_FILE 0
 #endif
 #ifndef MAP_COPY
 #define MAP_COPY MAP_PRIVATE
 #endif
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "pathnames.h"
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.506 2020/12/20 14:48:35 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.507 2020/12/20 14:52:16 rillig Exp $");
 /* types and constants */
 /*
  * Structure for a file being read ("included file")
  */
 typedef struct IFile {
 	char *fname;		/* name of file (relative? absolute?) */
 	Boolean fromForLoop;	/* simulated .include by the .for loop */
 	int lineno;		/* current line number in file */
 	int first_lineno;	/* line number of start of text */
 	unsigned int cond_depth; /* 'if' nesting when file opened */
 	Boolean depending;	/* state of doing_depend on EOF */
 @@ -1952,47 +1952,47 @@ VarAssign_EvalSubst(const char *name, co
 	(void)Var_Subst(uvalue, ctxt, VARE_WANTRES | VARE_KEEP_DOLLAR, &evalue);
 	/* TODO: handle errors */
 	preserveUndefined = savedPreserveUndefined;
 	avalue = evalue;
 	Var_Set(name, avalue, ctxt);
 	*out_avalue = (FStr){ avalue, evalue };
+}
 static void
 VarAssign_EvalShell(const char *name, const char *uvalue, GNode *ctxt,
 		    FStr *out_avalue)
+{
-	const char *cmd, *errfmt;
+	FStr cmd;
 	const char *errfmt;
 	char *cmdOut;
 	void *cmd_freeIt = NULL;
-	cmd = uvalue;
+	cmd = FStr_InitRefer(uvalue);
-	if (strchr(cmd, '$') != NULL) {
+	if (strchr(cmd.str, '$') != NULL) {
-		char *ecmd;
+		char *expanded;
-		(void)Var_Subst(cmd, VAR_CMDLINE, VARE_WANTRES | VARE_UNDEFERR,
+		(void)Var_Subst(cmd.str, VAR_CMDLINE,
-		    &ecmd);
+		    VARE_WANTRES | VARE_UNDEFERR, &expanded);
 		/* TODO: handle errors */
-		cmd = cmd_freeIt = ecmd;
+		cmd = FStr_InitOwn(expanded);
+	}
-	cmdOut = Cmd_Exec(cmd, &errfmt);
+	cmdOut = Cmd_Exec(cmd.str, &errfmt);
 	Var_Set(name, cmdOut, ctxt);
 	*out_avalue = FStr_InitOwn(cmdOut);
 	if (errfmt != NULL)
 		Parse_Error(PARSE_WARNING, errfmt, cmd);
-	free(cmd_freeIt);
+	FStr_Done(&cmd);
+}
 /* Perform a variable assignment.
+ *
  * The actual value of the variable is returned in *out_avalue and
  * *out_avalue_freeIt.  Especially for VAR_SUBST and VAR_SHELL this can differ
  * from the literal value.
+ *
  * Return whether the assignment was actually done.  The assignment is only
  * skipped if the operator is '?=' and the variable already exists. */
 static Boolean
 VarAssign_Eval(const char *name, VarAssignOp op, const char *uvalue,
 	       GNode *ctxt, FStr *out_TRUE_avalue)