thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2025-12-12 02:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(string): correctly handle not found case in SStrStr

Browse source
This commit is contained in:
fallenoak 2020-11-16 17:54:56 -06:00
parent 001edb9a7a
commit 611186db9e
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storm/String.cpp
View file

@ -234,8 +234,12 @@ const char* SStrStr(const char* string, const char* search) {
return nullptr; return nullptr;
} }
while (*substring && SStrCmp(substring, search, length)) { while (SStrCmp(substring, search, length)) {
substring++; substring++;
if (!*substring) {
return nullptr;
}
} }
return substring; return substring;

14
test/String.cpp
View file

@ -91,6 +91,20 @@ TEST_CASE("SStrStr", "[string]") {
REQUIRE(!SStrCmp(search, substring, SStrLen(search))); REQUIRE(!SStrCmp(search, substring, SStrLen(search)));
} }
SECTION("finds substring when search is empty") {
auto string = "foobar";
auto search = "";
auto substring = SStrStr(string, search);
REQUIRE(!SStrCmp(string, substring, SStrLen(string)));
}
SECTION("returns nullptr when search does not exist in string") {
auto string = "foobar";
auto search = "xyzzy";
auto substring = SStrStr(string, search);
REQUIRE(substring == nullptr);
}
SECTION("returns nullptr when given empty string") { SECTION("returns nullptr when given empty string") {
auto string = ""; auto string = "";
auto search = "bar"; auto search = "bar";