d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Possibly expand the variable name's embedded variables before using it, as

Browse Source 
seen (somewhat) in NetBSD.  This catches a few extra recursion cases that
could be hidden by expanding a NIL variable causing an existing variable to
be returned (which caused infinite looping and climbing memory usage in at
least one case).

Obtained from:	NetBSD (in principle)
This commit is contained in:
Juli Mallett 2002-06-19 17:23:08 +00:00
parent dafdb1b4c5
commit 0a9c401f9a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=98439
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.bin/make/var.c
View File

@ -167,6 +167,7 @@ typedef struct {
} VarREPattern;
static int VarCmp(void *, void *);
static void VarPossiblyExpand(char **, GNode *);
static Var *VarFind(char *, GNode *, int);
static void VarAdd(char *, char *, GNode *);
static void VarDelete(void *);
@ -210,6 +211,27 @@ VarCmp (v, name)
return (strcmp ((char *) name, ((Var *) v)->name));
}
/*-
*-----------------------------------------------------------------------
* VarPossiblyExpand --
* Expand a variable name's embedded variables in the given context.
*
* Results:
* The string pointed to by `name' may change.
*
* Side Effects:
* None.
*-----------------------------------------------------------------------
*/
static void
VarPossiblyExpand(name, ctxt)
char **name;
GNode *ctxt;
{
if (strchr(*name, '$') != NULL)
*name = Var_Subst(NULL, *name, ctxt, 0);
}
/*-
*-----------------------------------------------------------------------
* VarFind --
@ -471,6 +493,7 @@ Var_Set (name, val, ctxt)
* here will override anything in a lower context, so there's not much
* point in searching them all just to save a bit of memory...
*/
VarPossiblyExpand(&name, ctxt);
v = VarFind (name, ctxt, 0);
if (v == (Var *) NULL) {
VarAdd (name, val, ctxt);
@ -521,6 +544,7 @@ Var_Append (name, val, ctxt)
{
Var *v;
VarPossiblyExpand(&name, ctxt);
v = VarFind (name, ctxt, (ctxt == VAR_GLOBAL) ? FIND_ENV : 0);
if (v == (Var *) NULL) {
@ -567,6 +591,7 @@ Var_Exists(name, ctxt)
{
Var *v;
VarPossiblyExpand(&name, ctxt);
v = VarFind(name, ctxt, FIND_CMD|FIND_GLOBAL|FIND_ENV);
if (v == (Var *)NULL) {
@ -599,6 +624,7 @@ Var_Value (name, ctxt, frp)
{
Var *v;
VarPossiblyExpand(&name, ctxt);
v = VarFind (name, ctxt, FIND_ENV | FIND_GLOBAL | FIND_CMD);
*frp = NULL;
if (v != (Var *) NULL) {