Merge 65d2f91 into f582eaf

bitwizeshift · Mar 13, 2021 · a9cffd0 · a9cffd0
2 parents f582eaf + 65d2f91
commit a9cffd0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/include/bpstd/detail/string_view.inl b/include/bpstd/detail/string_view.inl
@@ -293,7 +293,7 @@ namespace bpstd {
     }
 
     const auto offset = pos;
-    const auto increments = size() - v.size();
+    const auto increments = size() - v.size() - offset;
 
     for (auto i = 0u; i <= increments; ++i) {
       const auto j = i + offset;

diff --git a/single_include/bpstd/string_view.hpp b/single_include/bpstd/string_view.hpp
@@ -788,7 +788,7 @@ namespace bpstd {
     }
 
     const auto offset = pos;
-    const auto increments = size() - v.size();
+    const auto increments = size() - v.size() - offset;
 
     for (auto i = 0u; i <= increments; ++i) {
       const auto j = i + offset;

diff --git a/tests/bpstd/string_view.test.cpp b/tests/bpstd/string_view.test.cpp
@@ -545,6 +545,23 @@ TEST_CASE("string_view::find", "[operations]")
         REQUIRE( result == 0u );
       }
     }
+    SECTION("Argument is string, offset in string, no match")
+    {
+        bpstd::string_view s1 = "01234567890ABCDEFGHIJ";
+        bpstd::string_view s2 = "01";
+
+        auto result = s1.find(s2);
+        SECTION("prefix find ok")
+        {
+            REQUIRE(result != bpstd::string_view::npos);
+            REQUIRE(s1.size() > 10);
+        }
+        auto result1 = s1.find(s2, 10);
+        SECTION("nonmatching substring")
+        {
+            REQUIRE(result1 == bpstd::string_view::npos);
+        }
+    }
   }
 }