Make ContentType(string) constructor throw FormatException instead of IndexOutOfRange...

diff --git a/src/libraries/Common/src/System/Net/Mail/MailBnfHelper.cs b/src/libraries/Common/src/System/Net/Mail/MailBnfHelper.cs
index 0b9292f..b465942 100644 (file)
--- a/src/libraries/Common/src/System/Net/Mail/MailBnfHelper.cs
+++ b/src/libraries/Common/src/System/Net/Mail/MailBnfHelper.cs
@@ -267,7 +267,7 @@ namespace System.Net.Mime
                 }
             }
 
-            if (start == offset)
+            if (start == offset && offset < data.Length)
             {
                 throw new FormatException(SR.Format(SR.MailHeaderFieldInvalidCharacter, data[offset]));
             }

diff --git a/src/libraries/System.Net.Mail/tests/Functional/ContentTypeTest.cs b/src/libraries/System.Net.Mail/tests/Functional/ContentTypeTest.cs
index 2eabf68..603b910 100644 (file)
--- a/src/libraries/System.Net.Mail/tests/Functional/ContentTypeTest.cs
+++ b/src/libraries/System.Net.Mail/tests/Functional/ContentTypeTest.cs
@@ -53,7 +53,7 @@ namespace System.Net.Mime.Tests
         [InlineData(typeof(FormatException), "text/plain; charset=utf-8 ,")]
         [InlineData(typeof(FormatException), "text/plain; charset=utf-8,")]
         [InlineData(typeof(FormatException), "textplain")]
-        [InlineData(typeof(IndexOutOfRangeException), "text/")]
+        [InlineData(typeof(FormatException), "text/")]
         [InlineData(typeof(FormatException), ",, , ,,text/plain; charset=iso-8859-1; q=1.0,\r\n */xml; charset=utf-8; q=0.5,,,")]
         [InlineData(typeof(FormatException), "text/plain; charset=iso-8859-1; q=1.0, */xml; charset=utf-8; q=0.5")]
         [InlineData(typeof(FormatException), " , */xml; charset=utf-8; q=0.5 ")]