Skip to content

Fix PSModuleInfo.CaptureLocals to not do ValidateAttribute check when capturing variables from the caller's scope #3149

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
daxian-dbw merged 2 commits into from
Feb 17, 2017
Merged

Fix PSModuleInfo.CaptureLocals to not do ValidateAttribute check when capturing variables from the caller's scope #3149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f8b133
Fix PSModuleInfo.CaptureLocals to not do ValidateAttribute check when…
daxian-dbw Feb 14, 2017
8ea81d0
Add a comment in the test
daxian-dbw Feb 16, 2017
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
5 changes: 4 additions & 1 deletion src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,10 @@ internal void CaptureLocals()
// Only copy simple mutable variables...
if (v.Options == ScopedItemOptions.None && !(v is NullVariable))
{
PSVariable newVar = new PSVariable(v.Name, v.Value, v.Options, v.Attributes, v.Description);
PSVariable newVar = new PSVariable(v.Name, v.Value, v.Options, v.Description);
// The variable is already defined/set in the scope, and that means the attributes
// have already been checked if it was needed, so we don't do it again.
newVar.AddParameterAttributesNoChecks(v.Attributes);
SessionState.Internal.NewVariable(newVar, false);
}
}
Expand Down
42 changes: 42 additions & 0 deletions test/powershell/engine/Api/GetNewClosure.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
Describe "ScriptBlock.GetNewClosure()" -tags "CI" {

BeforeAll {

## No error should occur when calling GetNewClosure because:
## 1. ValidateAttributes are not evaluated on parameter default values
## 2. GetNewClosure no longer forces validation on existing variables
function SimpleFunction_GetNewClosure
{
param([ValidateNotNull()] $Name)

& { 'OK' }.GetNewClosure()
}

function ScriptCmdlet_GetNewClosure
{
[CmdletBinding()]
param(
[Parameter()]
[ValidateNotNullOrEmpty()]
[string] $Name = "",

[Parameter()]
[ValidateRange(1,3)]
[int] $Value = 4
)

& { $Value; $Name }.GetNewClosure()
}
}

It "Parameter attributes should not get evaluated again in GetNewClosure - SimpleFunction" {
SimpleFunction_GetNewClosure | Should Be "OK"
}

It "Parameter attributes should not get evaluated again in GetNewClosure - ScriptCmdlet" {
$result = ScriptCmdlet_GetNewClosure
$result.Count | Should Be 2
$result[0] | Should Be 4
$result[1] | Should Be ""
}
}