Merge pull request #2353 from ludovic-henry/fix-servicemodel-15153

[mono.git] / mcs / class / corlib / ReferenceSources / String.cs

diff --git a/mcs/class/corlib/ReferenceSources/String.cs b/mcs/class/corlib/ReferenceSources/String.cs
index 635040127f8e02311aa33f2f5e1361802855b753..78cd58f81a89c863c60a9a9e4088d312b35c0828 100644 (file)
--- a/mcs/class/corlib/ReferenceSources/String.cs
+++ b/mcs/class/corlib/ReferenceSources/String.cs
@@ -324,9 +324,23 @@ namespace System
                        }
                }
 
-        internal static int nativeCompareOrdinalEx (String strA, int indexA, String strB, int indexB, int count)
-        {
-               return CompareOrdinalUnchecked (strA, indexA, count, strB, indexB, count);
+               internal static int nativeCompareOrdinalEx (String strA, int indexA, String strB, int indexB, int count)
+               {
+                       //
+                       // .net does following checks in unmanaged land only which is quite
+                       // wrong as it's not always necessary and argument names don't match
+                       // but we are compatible
+                       //
+                       if (count < 0)
+                               throw new ArgumentOutOfRangeException("count", Environment.GetResourceString("ArgumentOutOfRange_NegativeCount"));
+
+                       if (indexA < 0 || indexA > strA.Length)
+                               throw new ArgumentOutOfRangeException("indexA", Environment.GetResourceString("ArgumentOutOfRange_Index"));
+
+                       if (indexB < 0 || indexB > strB.Length)
+                               throw new ArgumentOutOfRangeException("indexB", Environment.GetResourceString("ArgumentOutOfRange_Index"));
+
+                       return CompareOrdinalUnchecked (strA, indexA, count, strB, indexB, count);
         }
 
                unsafe String ReplaceInternal (char oldChar, char newChar)
@@ -679,74 +693,22 @@ namespace System
 
                unsafe string CreateString (char *value)
                {
-                       if (value == null)
-                               return Empty;
-                       char *p = value;
-                       int i = 0;
-                       while (*p != 0) {
-                               ++i;
-                               ++p;
-                       }
-                       string result = FastAllocateString (i);
-
-                       if (i != 0) {
-                               fixed (char *dest = result) {
-                                       CharCopy (dest, value, i);
-                               }
-                       }
-                       return result;
+                       return CtorCharPtr (value);
                }
 
                unsafe string CreateString (char *value, int startIndex, int length)
                {
-                       if (length == 0)
-                               return Empty;
-                       if (value == null)
-                               throw new ArgumentNullException ("value");
-                       if (startIndex < 0)
-                               throw new ArgumentOutOfRangeException ("startIndex");
-                       if (length < 0)
-                               throw new ArgumentOutOfRangeException ("length");
-
-                       string result = FastAllocateString (length);
-
-                       fixed (char *dest = result) {
-                               CharCopy (dest, value + startIndex, length);
-                       }
-                       return result;
+                       return CtorCharPtrStartLength (value, startIndex, length);
                }
 
-               unsafe string CreateString (char [] val, int startIndex, int length)
+               string CreateString (char [] val, int startIndex, int length)
                {
-                       if (val == null)
-                               throw new ArgumentNullException ("value");
-                       if (startIndex < 0)
-                               throw new ArgumentOutOfRangeException ("startIndex", "Cannot be negative.");
-                       if (length < 0)
-                               throw new ArgumentOutOfRangeException ("length", "Cannot be negative.");
-                       if (startIndex > val.Length - length)
-                               throw new ArgumentOutOfRangeException ("startIndex", "Cannot be negative, and should be less than length of string.");
-                       if (length == 0)
-                               return Empty;
-
-                       string result = FastAllocateString (length);
-
-                       fixed (char *dest = result, src = val) {
-                               CharCopy (dest, src + startIndex, length);
-                       }
-                       return result;
+                       return CtorCharArrayStartLength (val, startIndex, length);
                }
 
-               unsafe string CreateString (char [] val)
+               string CreateString (char [] val)
                {
-                       if (val == null || val.Length == 0)
-                               return Empty;
-                       string result = FastAllocateString (val.Length);
-
-                       fixed (char *dest = result, src = val) {
-                               CharCopy (dest, src, val.Length);
-                       }
-                       return result;
+                       return CtorCharArray (val);
                }
 
                unsafe string CreateString (char c, int count)