OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix plStringStream for the case of adding a '\0' char non-destructively

Browse Source
This commit is contained in:
Michael Hansen
2012-02-14 22:15:07 -08:00
committed by Adam Johnson
parent 81465e621b
commit 8bf78c0e35
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/Plasma/CoreLib/plString.cpp
View File

@ -699,9 +699,8 @@ plString operator+(const plString &left, const plString &right)
return str; return str;
} }
plStringStream &plStringStream::operator<<(const char *text) plStringStream &plStringStream::append(const char *data, size_t length)
{ {
size_t length = strlen(text);
if (fLength + length > fBufSize) { if (fLength + length > fBufSize) {
char *bigger = new char[fBufSize * 2]; char *bigger = new char[fBufSize * 2];
memcpy(bigger, fBuffer, fBufSize); memcpy(bigger, fBuffer, fBufSize);
@ -709,11 +708,17 @@ plStringStream &plStringStream::operator<<(const char *text)
fBuffer = bigger; fBuffer = bigger;
fBufSize *= 2; fBufSize *= 2;
} }
memcpy(fBuffer + fLength, text, length); memcpy(fBuffer + fLength, data, length);
fLength += length; fLength += length;
return *this; return *this;
} }
plStringStream &plStringStream::operator<<(const char *text)
{
size_t length = strlen(text);
return append(text, length);
}
plStringStream &plStringStream::operator<<(int num) plStringStream &plStringStream::operator<<(int num)
{ {
char buffer[12]; char buffer[12];
@ -727,9 +732,3 @@ plStringStream &plStringStream::operator<<(unsigned int num)
snprintf(buffer, 12, "%u", num); snprintf(buffer, 12, "%u", num);
return operator<<(buffer); return operator<<(buffer);
} }
plStringStream &plStringStream::operator<<(char ch)
{
char buffer[2] = { ch, 0 };
return operator<<(buffer);
}

6
Sources/Plasma/CoreLib/plString.h
View File

@ -408,14 +408,16 @@ public:
} }
~plStringStream() { delete [] fBuffer; } ~plStringStream() { delete [] fBuffer; }
plStringStream &append(const char *data, size_t length);
plStringStream &operator<<(const char *text); plStringStream &operator<<(const char *text);
plStringStream &operator<<(int num); plStringStream &operator<<(int num);
plStringStream &operator<<(unsigned int num); plStringStream &operator<<(unsigned int num);
plStringStream &operator<<(char ch); plStringStream &operator<<(char ch) { return append(&ch, 1); }
plStringStream &operator<<(const plString &text) plStringStream &operator<<(const plString &text)
{ {
return operator<<(text.s_str()); return append(text.s_str(), text.GetSize());
} }
size_t GetLength() const { return fLength; } size_t GetLength() const { return fLength; }