blob: 6c01a59269d44489f22059ea0b1c88d333e2aa8c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
Fix out of bounds assertion with -D_GLIBCXX_ASSERTIONS on empty string in testsuite.
--- a/lastfmlib/utils/stringoperations.cpp
+++ b/lastfmlib/utils/stringoperations.cpp
@@ -40,7 +40,7 @@ void trim(std::string& aString)
{
size_t begin = 0;
size_t end = aString.size() - 1;
-
+
while ( aString[begin] == ' ' || aString[begin] == '\t'
|| aString[begin] == '\r' || aString[begin] == '\n')
{
@@ -50,8 +50,10 @@ void trim(std::string& aString)
break;
}
- if (begin == aString.size())
+ if (begin == aString.size()) {
aString = "";
+ return;
+ }
while ( aString[end] == ' ' || aString[end] == '\t'
|| aString[end] == '\r' || aString[end] == '\n')
|
