maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update regular expression to filter out Json contents that do not start with an array for ConvertFrom-Json. (#3882)

Browse source
This commit is contained in:
Francisco Gamino 2017-06-01 11:15:17 -07:00 committed by Travis Plunk
parent 00a11d9201
commit e1599b59ac
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
View file

@ -53,8 +53,8 @@ namespace Microsoft.PowerShell.Commands
// This issue is being tracked by https://github.com/JamesNK/Newtonsoft.Json/issues/1321.
// To work around this, we need to identify when input is a Json array, and then try to parse it via JArray.Parse().
// If input starts with '[' or ends with ']' (ignoring white spaces).
if ((Regex.Match(input, @"(^\s*\[)|(\s*\]$)")).Success)
// If input starts with '[' (ignoring white spaces).
if ((Regex.Match(input, @"^\s*\[")).Success)
{
// JArray.Parse() will throw a JsonException if the array is invalid.
// This will be caught by the catch block below, and then throw an