From a82acace469cd0302231a8216af73d0b60b25770 Mon Sep 17 00:00:00 2001
From: James Newton-King <james@newtonking.com>
Date: Mon, 21 May 2018 15:49:36 +1200
Subject: [PATCH] Fixed parsing decimals with exponents in strings (#1714)

---
 Src/Newtonsoft.Json.Tests/Issues/Issue1711.cs | 68 +++++++++++++++++++
 Src/Newtonsoft.Json/JsonReader.cs             |  9 ++-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 Src/Newtonsoft.Json.Tests/Issues/Issue1711.cs

diff --git a/Src/Newtonsoft.Json.Tests/Issues/Issue1711.cs b/Src/Newtonsoft.Json.Tests/Issues/Issue1711.cs
new file mode 100644
index 00000000..fea1623f
--- /dev/null
+++ b/Src/Newtonsoft.Json.Tests/Issues/Issue1711.cs
@@ -0,0 +1,68 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.Serialization;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json.Utilities;
+#if DNXCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Issues
+{
+    [TestFixture]
+    public class Issue1711 : TestFixtureBase
+    {
+        [Test]
+        public void Test_Raw()
+        {
+            FooClass c = JsonConvert.DeserializeObject<FooClass>(@"{ ""Value"" : 96.014e-05 }");
+            Assert.AreEqual(0.00096014m, c.Value);
+        }
+
+        [Test]
+        public void Test_String()
+        {
+            FooClass c = JsonConvert.DeserializeObject<FooClass>(@"{ ""Value"" : ""96.014e-05"" }");
+            Assert.AreEqual(0.00096014m, c.Value);
+        }
+
+        public class FooClass
+        {
+            public decimal? Value { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json/JsonReader.cs b/Src/Newtonsoft.Json/JsonReader.cs
index 8b2adae1..9e9687dd 100644
--- a/Src/Newtonsoft.Json/JsonReader.cs
+++ b/Src/Newtonsoft.Json/JsonReader.cs
@@ -793,11 +793,18 @@ namespace Newtonsoft.Json
                 return null;
             }
 
-            if (decimal.TryParse(s, NumberStyles.Number, Culture, out decimal d))
+            decimal d;
+            if (decimal.TryParse(s, NumberStyles.Number, Culture, out d))
             {
                 SetToken(JsonToken.Float, d, false);
                 return d;
             }
+            else if (ConvertUtils.DecimalTryParse(s.ToCharArray(), 0, s.Length, out d) == ParseResult.Success)
+            {
+                // This is to handle strings like "96.014e-05" that are not supported by traditional decimal.TryParse
+                SetToken(JsonToken.Float, d, false);
+                return d;
+            }
             else
             {
                 SetToken(JsonToken.String, s, false);