* list :

[mono.git] / mono / metadata / string-icalls.c

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index 51716a5ac370050f69fb1ddb96d9e7a12a5db3a5..4b8f9f9a420935159260cfae571496299df1b3be 100644 (file)
--- a/mono/metadata/string-icalls.c
+++ b/mono/metadata/string-icalls.c
@@ -504,7 +504,7 @@ gint32
 ves_icall_System_String_InternalIndexOf_Str (MonoString *me, MonoString *value, gint32 sindex, gint32 count)
 {
        gint32 lencmpstr;
-       gint32 pos;
+       gint32 pos, i;
        gunichar2 *src;
        gunichar2 *cmpstr;
 
@@ -513,12 +513,12 @@ ves_icall_System_String_InternalIndexOf_Str (MonoString *me, MonoString *value,
        src = mono_string_chars(me);
        cmpstr = mono_string_chars(value);
 
-       for (pos = sindex; pos != count + sindex; pos++) {
-               if (pos + lencmpstr > count + sindex)
-                       return -1;
-
-               if (0 == memcmp(src + pos, cmpstr, lencmpstr * sizeof(gunichar2)))
-                       return pos;
+       count -= lencmpstr;
+       for (pos = sindex; pos <= sindex + count; pos++) {
+               for (i = 0; src [pos + i] == cmpstr [i];) {
+                       if (++i == lencmpstr)
+                               return pos;
+               }
        }
 
        return -1;