Correct for element size

dotnet · Jan 25, 2019 · 156f782 · 156f782
1 parent ee69d66
commit 156f782
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/System.Private.CoreLib/shared/System/SpanHelpers.Char.cs b/src/System.Private.CoreLib/shared/System/SpanHelpers.Char.cs
@@ -263,8 +263,9 @@ public static int IndexOf(ref char searchSpace, char value, int length)
                                 continue;
                             }
 
-                            // Find bitflag offset of first match and add to current offset
-                            return offset + BitOps.TrailingZeroCount(matches);
+                            // Find bitflag offset of first match and add to current offset, 
+                            // flags are in bytes so divide for chars
+                            return offset + (BitOps.TrailingZeroCount(matches) / sizeof(char));
                         } while (lengthToExamine > offset);
                     }
 
@@ -283,8 +284,9 @@ public static int IndexOf(ref char searchSpace, char value, int length)
                         }
                         else
                         {
-                            // Find bitflag offset of first match and add to current offset
-                            return offset + BitOps.TrailingZeroCount(matches);
+                            // Find bitflag offset of first match and add to current offset, 
+                            // flags are in bytes so divide for chars
+                            return offset + (BitOps.TrailingZeroCount(matches) / sizeof(char));
                         }
                     }
 
@@ -315,8 +317,9 @@ public static int IndexOf(ref char searchSpace, char value, int length)
                             continue;
                         }
 
-                        // Find bitflag offset of first match and add to current offset
-                        return offset + BitOps.TrailingZeroCount(matches);
+                        // Find bitflag offset of first match and add to current offset, 
+                        // flags are in bytes so divide for chars
+                        return offset + (BitOps.TrailingZeroCount(matches) / sizeof(char));
                     }
 
                     if (offset < length)