Revision 5d272988
Added by Alexis Mousset about 7 years ago
| rudder-agent/SOURCES/patches/cfengine/10576-avoid-copy-variable-table.patch | ||
|---|---|---|
|
return NULL;
|
||
|
}
|
||
|
|
||
|
diff --git a/libpromises/expand.c b/libpromises/expand.c
|
||
|
index d121fb9..9d96cdc 100644
|
||
|
--- a/libpromises/expand.c
|
||
|
+++ b/libpromises/expand.c
|
||
|
@@ -485,7 +485,7 @@ static void ExpandAndMapIteratorsFromScalar(EvalContext *ctx,
|
||
|
}
|
||
|
|
||
|
// No need to map this.* even though it's technically qualified
|
||
|
- if (success && IsQualifiedVariable(BufferData(value)) && strcmp(ref->scope, "this") != 0)
|
||
|
+ if (success && IsQualifiedVariable(BufferData(value)) && (!ref->scope || (strcmp(ref->scope, "this") != 0)))
|
||
|
{
|
||
|
char *dotpos = strchr(substring, '.');
|
||
|
if (dotpos)
|
||
|
diff --git a/libpromises/var_expressions.c b/libpromises/var_expressions.c
|
||
|
index fbbe6b7..48d1042 100644
|
||
|
--- a/libpromises/var_expressions.c
|
||
Also available in: Unified diff
Fixes #10595: Broken tests after parent