Skip to content

Harden parameter name selection in the funcletizer #37479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 1 commit into from
Jan 12, 2026
Merged

Harden parameter name selection in the funcletizer #37479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions src/EFCore/Query/Internal/ExpressionTreeFuncletizer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2078,14 +2078,24 @@ bool PreserveConvertNode(Expression expression)
{
var value = EvaluateCore(expression, ref evaluateAsParameter, out var tempParameterName, out isContextAccessor);

if (evaluateAsParameter)
if (!evaluateAsParameter)
{
parameterName = string.Empty;
return value;
}

if (tempParameterName is null)
{
parameterName = string.IsNullOrWhiteSpace(tempParameterName) ? "p" : tempParameterName;
parameterName = "p";
}
else
{
parameterName = tempParameterName;

// The VB compiler prefixes closure member names with $VB$Local_, remove that (#33150)
if (parameterName.StartsWith("$VB$Local_", StringComparison.Ordinal))
{
parameterName = parameterName.Substring("$VB$Local_".Length);
parameterName = parameterName["$VB$Local_".Length..];
}

// In many databases, parameter names must start with a letter or underscore.
Expand All @@ -2096,15 +2106,21 @@ bool PreserveConvertNode(Expression expression)
parameterName = "_" + parameterName;
}

parameterName = Uniquifier.Uniquify(parameterName, _parameterNames, maxLength: int.MaxValue, uniquifier: _parameterNames.Count);

_parameterNames.Add(parameterName);
}
else
{
parameterName = string.Empty;
// Just as a safety guard, if there's any problematic character in the name for any reason, fall back to "p".
foreach (var c in parameterName)
{
if (!char.IsLetterOrDigit(c) && c != '_')
{
parameterName = "p";
break;
}
}
}

parameterName = Uniquifier.Uniquify(parameterName, _parameterNames, maxLength: int.MaxValue, uniquifier: _parameterNames.Count);

_parameterNames.Add(parameterName);

return value;

object? EvaluateCore(Expression? expression, ref bool evaluateAsParameter, out string? parameterName, out bool isContextAccessor)
Expand Down
Loading