The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

constification, code style, changed vector<FileInfo*> to vector<FileInfo> for less allocs and more speed in debug mode

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@611 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-09-22 20:35:44 +00:00
parent 38f04809f1
commit cca92d4e38
12 changed files with 136 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/Src/StringUtil.cpp
View File

@ -135,20 +135,20 @@ bool AsciiToHex(const char* _szValue, u32& result)
return (true);
}
bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args)
{
int writtenCount = vsnprintf(out, outsize, format, args);
if (writtenCount > 0)
if (writtenCount > 0 && writtenCount < outsize)
{
out[writtenCount] = '\0';
return(true);
return true;
}
else
{
out[outsize - 1] = '\0';
return(false);
PanicAlert("DANGER WILL ROBINSON! CharArrayFromFormatV overflowed.");
return false;
}
}
@ -165,6 +165,8 @@ void StringFromFormatV(std::string* out, const char* format, va_list args)
delete [] buf;
buf = new char[newSize + 1];
writtenCount = vsnprintf(buf, newSize, format, args);
if (writtenCount > (int)newSize)
writtenCount = -1;
// ARGH! vsnprintf does no longer return -1 on truncation in newer libc!
// WORKAROUND! let's fake the old behaviour (even though it's less efficient).
// TODO: figure out why the fix causes an invalid read in strlen called from vsnprintf :(