Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcos Henrich <marcos.henrich@xamarin.com>2015-04-16 21:12:29 +0300
committerMarcos Henrich <marcos.henrich@xamarin.com>2015-04-16 21:12:29 +0300
commit0ac4c241160d915abce58dbbf99522a2b7ef39d9 (patch)
tree6fa26cd769d17101d88d2a469333af0dcb183752 /mcs/class/System.Web.Extensions
parentd8e2ec1832d4a08c47ff22f55ec6206e349faead (diff)
[System.Web.Extension] Fixes js deserialization.
Fixes JavaScriptSerializer.Deserialize of values with trailing spaces. Fixes #4148.
Diffstat (limited to 'mcs/class/System.Web.Extensions')
-rw-r--r--mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs
index dfc16133567..891b1ef66ce 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs
+++ b/mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JsonDeserializer.cs
@@ -495,21 +495,21 @@ namespace System.Web.Script.Serialization
break;
case JsonType.TRUE:
- if (String.Compare (s, "true", StringComparison.Ordinal) == 0)
+ if (String.Compare (s.Trim (), "true", StringComparison.Ordinal) == 0)
result = true;
else
converted = false;
break;
case JsonType.FALSE:
- if (String.Compare (s, "false", StringComparison.Ordinal) == 0)
+ if (String.Compare (s.Trim (), "false", StringComparison.Ordinal) == 0)
result = false;
else
converted = false;
break;
case JsonType.NULL:
- if (String.Compare (s, "null", StringComparison.Ordinal) != 0)
+ if (String.Compare (s.Trim (), "null", StringComparison.Ordinal) != 0)
converted = false;
break;