external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix bug with for loop (#1263)

Browse source
This commit is contained in:
MakarovYaroslav 2018-11-11 08:27:33 +03:00 • committed by winlin
parent 4cb8de3029
commit a2480a6c94
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -222,7 +222,7 @@ string srs_string_trim_end(string str, string trim_chars)
ret.erase(ret.end() - 1); ret.erase(ret.end() - 1);
// ok, matched, should reset the search // ok, matched, should reset the search
i = 0; i = -1;
} }
} }
@ -240,7 +240,7 @@ string srs_string_trim_start(string str, string trim_chars)
ret.erase(ret.begin()); ret.erase(ret.begin());
// ok, matched, should reset the search // ok, matched, should reset the search
i = 0; i = -1;
} }
} }
@ -259,7 +259,7 @@ string srs_string_remove(string str, string remove_chars)
it = ret.erase(it); it = ret.erase(it);
// ok, matched, should reset the search // ok, matched, should reset the search
i = 0; i = -1;
} else { } else {
++it; ++it;
} }

11
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -1487,6 +1487,15 @@ VOID TEST(KernelUtilityTest, UtilityString)
str1 = srs_string_replace(str, "o", "XX"); str1 = srs_string_replace(str, "o", "XX");
EXPECT_STREQ("HellXX, WXXrld! HellXX, SRS!", str1.c_str()); EXPECT_STREQ("HellXX, WXXrld! HellXX, SRS!", str1.c_str());
str1 = srs_string_trim_start(str, "x");
EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str());
str1 = srs_string_trim_start(str, "S!R");
EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str());
str1 = srs_string_trim_start(str, "lHe");
EXPECT_STREQ("o, World! Hello, SRS!", str1.c_str());
str1 = srs_string_trim_end(str, "x"); str1 = srs_string_trim_end(str, "x");
EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str()); EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str());
@ -1494,7 +1503,7 @@ VOID TEST(KernelUtilityTest, UtilityString)
str1 = srs_string_trim_end(str, "He"); str1 = srs_string_trim_end(str, "He");
EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str()); EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str());
str1 = srs_string_trim_end(str, "HeS!R"); str1 = srs_string_trim_end(str, "S!R");
EXPECT_STREQ("Hello, World! Hello, ", str1.c_str()); EXPECT_STREQ("Hello, World! Hello, ", str1.c_str());
str1 = srs_string_remove(str, "x"); str1 = srs_string_remove(str, "x");