-Fixed not preventing negative integers with StringEnumConverter.Allo…

…wIntegerValues
JamesNK · Jun 11, 2017 · 4467bdb · 4467bdb
1 parent 64a092e
commit 4467bdb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs
@@ -586,6 +586,10 @@ public void EnumMemberWithNumbers()
             e = JsonConvert.DeserializeObject<NumberNamesEnum>("\"3\"", converter);
 
             Assert.AreEqual(NumberNamesEnum.third, e);
+
+            e = JsonConvert.DeserializeObject<NumberNamesEnum>("\"-4\"", converter);
+
+            Assert.AreEqual(NumberNamesEnum.fourth, e);
         }
 
         [Test]
@@ -604,6 +608,10 @@ public void EnumMemberWithNumbers_NoIntegerValues()
             e = JsonConvert.DeserializeObject<NumberNamesEnum>("\"3\"", converter);
 
             Assert.AreEqual(NumberNamesEnum.third, e);
+
+            e = JsonConvert.DeserializeObject<NumberNamesEnum>("\"-4\"", converter);
+
+            Assert.AreEqual(NumberNamesEnum.fourth, e);
         }
 #endif
 
@@ -618,6 +626,17 @@ public void AllowIntegerValueAndStringNumber()
             Assert.AreEqual("Integer string '1' is not allowed.", ex.InnerException.Message);
         }
 
+        [Test]
+        public void AllowIntegerValueAndNegativeStringNumber()
+        {
+            JsonSerializationException ex = ExceptionAssert.Throws<JsonSerializationException>(() =>
+            {
+                JsonConvert.DeserializeObject<StoreColor>("\"-1\"", new StringEnumConverter { AllowIntegerValues = false });
+            });
+
+            Assert.AreEqual("Integer string '-1' is not allowed.", ex.InnerException.Message);
+        }
+
         [Test]
         public void AllowIntegerValueAndNonNamedValue()
         {
@@ -714,7 +733,9 @@ public enum NumberNamesEnum
         [EnumMember(Value = "1")]
         second,
         [EnumMember(Value = "3")]
-        third
+        third,
+        [EnumMember(Value = "-4")]
+        fourth
     }
 
     [DataContract]

diff --git a/Src/Newtonsoft.Json/Utilities/EnumUtils.cs b/Src/Newtonsoft.Json/Utilities/EnumUtils.cs
@@ -221,15 +221,7 @@ public static object ParseEnumName(string enumText, bool isNullable, bool disall
 
                 if (disallowValue)
                 {
-                    bool isNumber = true;
-                    for (int i = 0; i < finalEnumText.Length; i++)
-                    {
-                        if (!char.IsNumber(finalEnumText[i]))
-                        {
-                            isNumber = false;
-                            break;
-                        }
-                    }
+                    bool isNumber = int.TryParse(finalEnumText, NumberStyles.AllowLeadingSign, CultureInfo.InvariantCulture, out int _);
 
                     if (isNumber)
                     {