Skip to content

Add null check because AsNeeded parameter in ConvertTo-Csv and ExportTo-Csv cmdlets needs to analyze a value before quoting. #12281

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
anmenaga merged 1 commit into from
Apr 8, 2020
Merged

Add null check because AsNeeded parameter in ConvertTo-Csv and ExportTo-Csv cmdlets needs to analyze a value before quoting. #12281

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ internal string ConvertPSObjectToCSV(PSObject mshObject, IList<string> propertyN
AppendStringWithEscapeAlways(_outputString, value);
break;
case BaseCsvWritingCommand.QuoteKind.AsNeeded:
if (value.Contains(_delimiter))
if (value != null && value.Contains(_delimiter))
{
AppendStringWithEscapeAlways(_outputString, value);
}
Expand Down
16 changes: 16 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Describe "ConvertTo-Csv" -Tags "CI" {
BeforeAll {
$Name = "Hello"; $Data = "World";
$testObject = [pscustomobject]@{ FirstColumn = $Name; SecondColumn = $Data }
$testNullObject = [pscustomobject]@{ FirstColumn = $Name; SecondColumn = $null }
}

It "Should Be able to be called without error" {
Expand Down Expand Up @@ -121,6 +122,11 @@ Describe "ConvertTo-Csv" -Tags "CI" {

$result[0] | Should -BeExactly "`"FirstColumn`",`"SecondColumn`""
$result[1] | Should -BeExactly "`"Hello`",`"World`""

$result = $testNullObject | ConvertTo-Csv -UseQuotes Always -Delimiter ','

$result[0] | Should -BeExactly "`"FirstColumn`",`"SecondColumn`""
$result[1] | Should -BeExactly "`"Hello`","
}

It "UseQuotes Always is default" {
Expand All @@ -135,13 +141,23 @@ Describe "ConvertTo-Csv" -Tags "CI" {

$result[0] | Should -BeExactly "FirstColumn,SecondColumn"
$result[1] | Should -BeExactly "Hello,World"

$result = $testNullObject | ConvertTo-Csv -UseQuotes Never -Delimiter ','

$result[0] | Should -BeExactly "FirstColumn,SecondColumn"
$result[1] | Should -BeExactly "Hello,"
}

It "UseQuotes AsNeeded" {
$result = $testObject | ConvertTo-Csv -UseQuotes AsNeeded -Delimiter 'r'

$result[0] | Should -BeExactly "`"FirstColumn`"rSecondColumn"
$result[1] | Should -BeExactly "Hellor`"World`""

$result = $testNullObject | ConvertTo-Csv -UseQuotes AsNeeded -Delimiter 'r'

$result[0] | Should -BeExactly "`"FirstColumn`"rSecondColumn"
$result[1] | Should -BeExactly "Hellor"
}
}
}