Skip to content

Fix NRE in ConsiceView #11435

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
iSazonov merged 3 commits into from
Jan 14, 2020
Merged

Fix NRE in ConsiceView #11435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5835cd7
Fix NRE in ConsiceView
iSazonov Dec 26, 2019
c570d33
Use LanguagePrimitives.TryConvertTo() as last resort to string conver…
iSazonov Jan 13, 2020
fddb0d1
Fix typo
iSazonov Jan 13, 2020
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
35 changes: 19 additions & 16 deletions ...m.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,25 +883,28 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Autom
}
}
}
# anything else, we use ToString()
# Anything else, we convert to string.
# ToString() can throw so we use LanguagePrimitives.TryConvertTo() to hide a convert error
else {
$value = $prop.Value.ToString().Trim()

$isFirstLine = $true
if ($value.Contains($newline)) {
# the 3 is to account for ' : '
$valueIndent = ' ' * ($propLength + 3)
# need to trim any extra whitespace already in the text
foreach ($line in $value.Split($newline)) {
if (!$isFirstLine) {
$null = $output.Append(""${newline}${prefix}${valueIndent}"")
$value = $null
if ([System.Management.Automation.LanguagePrimitives]::TryConvertTo($prop.Value, [string], [ref]$value) -and $value -ne $null)
{
$isFirstLine = $true
if ($value.Contains($newline)) {
# the 3 is to account for ' : '
$valueIndent = ' ' * ($propLength + 3)
# need to trim any extra whitespace already in the text
foreach ($line in $value.Split($newline)) {
if (!$isFirstLine) {
$null = $output.Append(""${newline}${prefix}${valueIndent}"")
}
$null = $output.Append($line.Trim())
$isFirstLine = $false
}
$null = $output.Append($line.Trim())
$isFirstLine = $false
}
}
else {
$null = $output.Append($value)
else {
$null = $output.Append($value)
}
}
}

Expand Down