Handle null reference exception in CsvCommands.cs: ConvertPSObjectToCSV (#26144)

mikkas456 · web-flow · commit 123b45044385 · 2025-10-16T10:09:49.000+05:00
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
@@ -1044,7 +1044,7 @@ internal string ConvertPSObjectToCSV(PSObject mshObject, IList<string> propertyN
                 {
                     if (dictionary.Contains(propertyName))
                     {
-                        value = dictionary[propertyName].ToString();
+                        value = dictionary[propertyName]?.ToString();
                     }
                     else if (mshObject.Properties[propertyName] is PSPropertyInfo property)
                     {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Csv.Tests.ps1
@@ -212,6 +212,7 @@ Describe "ConvertTo-Csv" -Tags "CI" {
                 [ordered]@{ Number = $_; Letter = $Letters[$_] }
             }
             $CsvString = $Items | ConvertTo-Csv
+            $TestHashTable = [ordered]@{ 'first' = 'value1'; 'second' = $null; 'third' = 'value3' }
         }
 
         It 'should treat dictionary entries as properties' {
@@ -235,5 +236,12 @@ Describe "ConvertTo-Csv" -Tags "CI" {
             $NewCsvString[0] | Should -MatchExactly 'Extra'
             $NewCsvString | Select-Object -Skip 1 | Should -MatchExactly 'Surprise!'
         }
+
+        It 'should properly convert hashtable with null and non-null values'{
+            $CsvResult = $TestHashTable | ConvertTo-Csv
+
+            $CsvResult[0] | Should -BeExactly "`"first`",`"second`",`"third`""
+            $CsvResult[1] | Should -BeExactly "`"value1`",$null,`"value3`""
+        }
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Export-Csv.Tests.ps1
@@ -11,6 +11,7 @@ Describe "Export-Csv" -Tags "CI" {
         $P1 = [pscustomobject]@{"P1" = "first"}
         $P2 = [pscustomobject]@{"P2" = "second"}
         $P11 = [pscustomobject]@{"P1" = "eleventh"}
+        $testHashTable = @{ 'first' = "value1"; 'second' = $null; 'third' = "value3" }
     }
 
     AfterEach {
@@ -249,6 +250,33 @@ Describe "Export-Csv" -Tags "CI" {
         $contents[1].Contains($delimiter) | Should -BeTrue
     }
 
+    It "Should not throw when exporting hashtable with property that has null value"{
+        { $testHashTable | Export-Csv -Path $testCsv } | Should -Not -Throw
+    }
+
+    It "Should not throw when exporting PSCustomObject with property that has null value"{
+        $testObject = [pscustomobject]$testHashTable
+        { $testObject | Export-Csv -Path $testCsv } | Should -Not -Throw
+    }
+
+    It "Export hashtable with null and non-null values"{
+        $testHashTable | Export-Csv -Path $testCsv
+        $result2 = Import-CSV -Path $testCsv
+
+        $result2.first | Should -BeExactly "value1"
+        $result2.second | Should -BeNullOrEmpty
+        $result2.third | Should -BeExactly "value3"
+    }
+
+    It "Export hashtable with non-null values"{
+        $testTable = @{ 'first' = "value1"; 'second' = "value2" }
+        $testTable | Export-Csv -Path $testCsv
+        $results = Import-CSV -Path $testCsv
+
+        $results.first | Should -BeExactly "value1"
+        $results.second | Should -BeExactly "value2"
+    }
+
     Context "UseQuotes parameter" {
 
         # A minimum of tests. The rest are in ConvertTo-Csv.Tests.ps1

Original file line number	Diff line number	Diff line change
`@@ -1044,7 +1044,7 @@ internal string ConvertPSObjectToCSV(PSObject mshObject, IList<string> propertyN`
`1044`	`1044`	`{`
`1045`	`1045`	`if (dictionary.Contains(propertyName))`
`1046`	`1046`	`{`
`1047`		`- value = dictionary[propertyName].ToString();`
	`1047`	`+ value = dictionary[propertyName]?.ToString();`
`1048`	`1048`	`}`
`1049`	`1049`	`else if (mshObject.Properties[propertyName] is PSPropertyInfo property)`
`1050`	`1050`	`{`
Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@ Describe "ConvertTo-Csv" -Tags "CI" {`
`212`	`212`	`[ordered]@{ Number = $_; Letter = $Letters[$_] }`
`213`	`213`	`}`
`214`	`214`	`$CsvString = $Items \| ConvertTo-Csv`
	`215`	`+ $TestHashTable = [ordered]@{ 'first' = 'value1'; 'second' = $null; 'third' = 'value3' }`
`215`	`216`	`}`
`216`	`217`
`217`	`218`	`It 'should treat dictionary entries as properties' {`
`@@ -235,5 +236,12 @@ Describe "ConvertTo-Csv" -Tags "CI" {`
`235`	`236`	`$NewCsvString[0] \| Should -MatchExactly 'Extra'`
`236`	`237`	`$NewCsvString \| Select-Object -Skip 1 \| Should -MatchExactly 'Surprise!'`
`237`	`238`	`}`
	`239`	`+`
	`240`	`+ It 'should properly convert hashtable with null and non-null values'{`
	`241`	`+ $CsvResult = $TestHashTable \| ConvertTo-Csv`
	`242`	`+`
	`243`	+ $CsvResult[0] \| Should -BeExactly "`"first`",`"second`",`"third`""
	`244`	+ $CsvResult[1] \| Should -BeExactly "`"value1`",$null,`"value3`""
	`245`	`+ }`
`238`	`246`	`}`
`239`	`247`	`}`