fix bug with for loop (#1263)

ossrs · Nov 11, 2018 · a2480a6 · a2480a6
1 parent 4cb8de3
commit a2480a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp
@@ -222,7 +222,7 @@ string srs_string_trim_end(string str, string trim_chars)
             ret.erase(ret.end() - 1);
 
             // 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());
 
             // 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);
 
                 // ok, matched, should reset the search
-                i = 0;
+                i = -1;
             } else {
                 ++it;
             }

diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp
@@ -1487,14 +1487,23 @@ VOID TEST(KernelUtilityTest, UtilityString)
 
     str1 = srs_string_replace(str, "o", "XX");
     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");
     EXPECT_STREQ("Hello, World! Hello, SRS!", str1.c_str());
 
     str1 = srs_string_trim_end(str, "He");
     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());
 
     str1 = srs_string_remove(str, "x");