fix StringTrimRight range error

OpenAtomFoundation · Nov 21, 2023 · 1933ab5 · 1933ab5
1 parent ab0476f
commit 1933ab5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/pstd/pstd_string.cc b/src/pstd/pstd_string.cc
@@ -586,7 +586,7 @@ std::string StringTrim(const std::string& ori, const std::string& charList) {
   }
 
   auto end = ori.find_last_not_of(charList);
-  return std::move(ori.substr(begin, end - begin + 1));
+  return ori.substr(begin, end - begin + 1);
 }
 
 // Trim charList from left
@@ -599,7 +599,7 @@ std::string StringTrimLeft(const std::string& ori, const std::string& charList)
   if (begin == std::string::npos) {
     return "";
   }
-  return std::move(ori.substr(begin, ori.size() - begin));
+  return ori.substr(begin, ori.size() - begin);
 }
 
 // Trim charList from right
@@ -609,7 +609,10 @@ std::string StringTrimRight(const std::string& ori, const std::string& charList)
   }
 
   auto end = ori.find_last_not_of(charList);
-  return std::move(ori.substr(0, end + 1));
+  if (end == std::string::npos) {
+    return "";
+  }
+  return ori.substr(0, end + 1);
 }
 
 bool StringHasSpaces(const std::string& str) {