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

Fix issues from review, and pre-emptively fix a couple of potential plString::Format issues

Browse Source
This commit is contained in:
Michael Hansen
2013-01-02 17:51:45 -08:00
parent 74e06e3984
commit 7ba8fdf86e
4 changed files with 8 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -513,17 +513,21 @@ plString plString::IFormat(const char *fmt, va_list vptr)
for ( ;; ) {
va_copy(vptr, vptr_save);
plStringBuffer<char> bigbuffer;
char *data = bigbuffer.CreateWritableBuffer(size);
char *data = bigbuffer.CreateWritableBuffer(size-1);
chars = vsnprintf(data, size, fmt, vptr);
if (chars >= 0)
return bigbuffer;
if (chars >= 0) {
// We need to construct a new string here so the length
// parameter is accurate :(
return plString::FromUtf8(bigbuffer.GetData(), chars);
}
size *= 2;
hsAssert(size > 0, "Formatted string output is waaaaay too long");
}
} else if (chars >= 256) {
va_copy(vptr, vptr_save);
plStringBuffer<char> bigbuffer;
char *data = bigbuffer.CreateWritableBuffer(chars+1);
char *data = bigbuffer.CreateWritableBuffer(chars);
vsnprintf(data, chars+1, fmt, vptr);
return bigbuffer;
}