OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Fix issues from review

Browse Source
This commit is contained in:
Michael Hansen
2013-01-06 23:52:12 -08:00
parent 11558b8301
commit 9903e274bb
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,11 +501,11 @@ double plString::ToDouble() const
plString plString::IFormat(const char *fmt, va_list vptr) plString plString::IFormat(const char *fmt, va_list vptr)
{ {
char buffer[256]; char buffer[STRING_STACK_SIZE];
va_list vptr_save; va_list vptr_save;
va_copy(vptr_save, vptr); va_copy(vptr_save, vptr);
int chars = vsnprintf(buffer, 256, fmt, vptr); int chars = vsnprintf(buffer, STRING_STACK_SIZE, fmt, vptr);
if (chars < 0) { if (chars < 0) {
// We will need to try this multiple times until we get a // We will need to try this multiple times until we get a
// large enough buffer :( // large enough buffer :(
@ -522,9 +522,8 @@ plString plString::IFormat(const char *fmt, va_list vptr)
} }
size *= 2; size *= 2;
hsAssert(size > 0, "Formatted string output is waaaaay too long");
} }
} else if (chars >= 256) { } else if (chars >= STRING_STACK_SIZE) {
va_copy(vptr, vptr_save); va_copy(vptr, vptr_save);
plStringBuffer<char> bigbuffer; plStringBuffer<char> bigbuffer;
char *data = bigbuffer.CreateWritableBuffer(chars); char *data = bigbuffer.CreateWritableBuffer(chars);
@ -800,13 +799,12 @@ plString operator+(const char *left, const plString &right)
plStringStream &plStringStream::append(const char *data, size_t length) plStringStream &plStringStream::append(const char *data, size_t length)
{ {
size_t bufSize = ICanHasHeap() ? fBufSize : 256; size_t bufSize = ICanHasHeap() ? fBufSize : STRING_STACK_SIZE;
char *bufp = ICanHasHeap() ? fBuffer : fShort; char *bufp = ICanHasHeap() ? fBuffer : fShort;
if (fLength + length > bufSize) { if (fLength + length > bufSize) {
size_t bigSize = bufSize; size_t bigSize = bufSize;
do { do {
hsAssert(bigSize * 2, "plStringStream buffer too large");
bigSize *= 2; bigSize *= 2;
} while (fLength + length > bigSize); } while (fLength + length > bigSize);

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

@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
typedef unsigned int UniChar; typedef unsigned int UniChar;
#define SSO_CHARS (16) #define SSO_CHARS (16)
#define STRING_STACK_SIZE (256)
#define WHITESPACE_CHARS " \t\n\r" #define WHITESPACE_CHARS " \t\n\r"
template <typename _Ch> template <typename _Ch>
@ -341,10 +342,7 @@ plString operator+(const char *left, const plString &right);
class plStringStream class plStringStream
{ {
public: public:
plStringStream() : fLength(0) plStringStream() : fLength(0) { }
{
fShort[0] = 0;
}
~plStringStream() { if (ICanHasHeap()) delete [] fBuffer; } ~plStringStream() { if (ICanHasHeap()) delete [] fBuffer; }
plStringStream &append(const char *data, size_t length); plStringStream &append(const char *data, size_t length);
@ -375,11 +373,11 @@ private:
char *fBuffer; char *fBuffer;
size_t fBufSize; size_t fBufSize;
}; };
char fShort[256]; char fShort[STRING_STACK_SIZE];
}; };
size_t fLength; size_t fLength;
bool ICanHasHeap() const { return fLength > 256; } bool ICanHasHeap() const { return fLength > STRING_STACK_SIZE; }
}; };
size_t ustrlen(const UniChar *ustr, size_t max = plString::kSizeAuto); size_t ustrlen(const UniChar *ustr, size_t max = plString::kSizeAuto);