admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NRE in csv commands (#12281)

Browse Source
This commit is contained in:
Ilya
2020-04-08 16:28:54 -07:00
committed by GitHub
parent 622eb4cf02
commit b1e998046e
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
+1 -1
View File
@@ -1013,7 +1013,7 @@ namespace Microsoft.PowerShell.Commands
AppendStringWithEscapeAlways(_outputString, value);
break;
case BaseCsvWritingCommand.QuoteKind.AsNeeded:
if (value.Contains(_delimiter))
if (value != null && value.Contains(_delimiter))
{
AppendStringWithEscapeAlways(_outputString, value);
}
test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
+16
View File
@@ -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" {
@@ -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" {
@@ -135,6 +141,11 @@ 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" {
@@ -142,6 +153,11 @@ Describe "ConvertTo-Csv" -Tags "CI" {
$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"
}
}
}