Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Trim() method for empty strings and strings only containing spaces. Fixes #7392.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41076 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler 2011-03-22 03:05:39 +00:00
parent 6f477364cc
commit 37ffb53fb4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/kits/support/String.cpp
View File

@ -1964,25 +1964,28 @@ BString::CharacterDeescape(char escapeChar)
BString& BString&
BString::Trim() BString::Trim()
{ {
if (Length() <= 0)
return *this;
const char* string = String(); const char* string = String();
int32 startCount = 0; int32 startCount = 0;
while (isspace(string[startCount])) { while (isspace(string[startCount]))
startCount++; startCount++;
}
int32 endCount = 0; int32 endCount = 0;
while (isspace(string[Length() - endCount - 1])) { while (isspace(string[Length() - endCount - 1]))
endCount++; endCount++;
}
if (startCount == 0 && endCount == 0) if (startCount == 0 && endCount == 0)
return *this; return *this;
// We actually need to trim // We actually need to trim
size_t length = Length() - startCount - endCount; ssize_t length = Length() - startCount - endCount;
if (startCount == 0) { if (length < 0)
length = 0;
if (startCount == 0 || length == 0) {
_MakeWritable(length, true); _MakeWritable(length, true);
} else if (_MakeWritable() == B_OK) { } else if (_MakeWritable() == B_OK) {
memmove(fPrivateData, fPrivateData + startCount, length); memmove(fPrivateData, fPrivateData + startCount, length);