Imported Upstream version 1.0.0.9127upstream/1.0.0.9127

1 files changed, 1 insertions, 6 deletions

diff --git a/src/mscorlib/src/System/Globalization/EncodingDataItem.cs b/src/mscorlib/src/System/Globalization/EncodingDataItem.cs
index 1dc1bd2eaf..89ac780587 100644
--- a/src/mscorlib/src/System/Globalization/EncodingDataItem.cs
+++ b/src/mscorlib/src/System/Globalization/EncodingDataItem.cs
@@ -27,14 +27,12 @@ namespace System.Globalization {
         internal String m_bodyName;
         internal uint   m_flags;
     
-        [SecurityCritical]
         unsafe internal CodePageDataItem(int dataIndex) {
             m_dataIndex = dataIndex;
             m_uiFamilyCodePage = EncodingTable.codePageDataPtr[dataIndex].uiFamilyCodePage;
             m_flags = EncodingTable.codePageDataPtr[dataIndex].flags;
         }
 
-        [System.Security.SecurityCritical]
         unsafe internal static String CreateString(sbyte* pStrings, uint index)
         {
             if (pStrings[0] == '|') // |str1|str2|str3
@@ -62,7 +60,7 @@ namespace System.Globalization {
                     }
                 }
 
-                throw new ArgumentException("pStrings");
+                throw new ArgumentException(null, nameof(pStrings));
             }
             else
             {
@@ -71,7 +69,6 @@ namespace System.Globalization {
         }
 
         unsafe public String WebName {
-            [System.Security.SecuritySafeCritical]  // auto-generated
             get {
                 if (m_webName==null) {
                     m_webName = CreateString(EncodingTable.codePageDataPtr[m_dataIndex].Names, 0);
@@ -87,7 +84,6 @@ namespace System.Globalization {
         }
     
         unsafe public String HeaderName {
-            [System.Security.SecuritySafeCritical]  // auto-generated
             get {
                 if (m_headerName==null) {
                     m_headerName = CreateString(EncodingTable.codePageDataPtr[m_dataIndex].Names, 1);
@@ -97,7 +93,6 @@ namespace System.Globalization {
         }
     
         unsafe public String BodyName {
-            [System.Security.SecuritySafeCritical]  // auto-generated
             get {
                 if (m_bodyName==null) {
                     m_bodyName = CreateString(EncodingTable.codePageDataPtr[m_dataIndex].Names, 2);