mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

# Fixed string handling for Windows/Linux compatibility.

Browse Source 
* vsnprintf2: Made compatible between GCC and MSVC - it now always
null-terminates the buffer, and returns -1 on overflow. Fixes #158.
Added tests.
 * MeshManager: Use shared_ptr.expired() instead of checking for
bad_weak_ptr exception.
 * Xeromyces: Added tests for GetXMBPath, because it does unusual things
in sscanf which MSVC's /analyze complains about.
 * ConfigDB, ScriptGlue: Replaced some asserts with return-on-failure,
to avoid invalid array accesses when continuing after the assert (as
complained about by /analyze).
 * CStr: Removed "using namespace std". Added tests for handling of
invalid UTF-8.

This was SVN commit r4625.
This commit is contained in:
Ykkrosh
2006-11-07 21:03:13 +00:00
parent 75f2f9fd5f
commit a265a441fd
18 changed files with 254 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/CStr.cpp
+12 -11
View File
@@ -38,7 +38,7 @@ CStr8 CStrW::ToUTF8() const
{
CStr8 result;
for (size_t i = 0; i < Length(); ++i)
for (size_t i = 0; i < length(); ++i)
{
unsigned short bytesToWrite;
wchar_t ch = (*this)[i];
@@ -58,12 +58,14 @@ CStr8 CStrW::ToUTF8() const
case 2: *--target = ((ch | 0x80) & 0xBF); ch >>= 6;
case 1: *--target = (ch | firstByteMark[bytesToWrite]);
}
result += CStr(buf, bytesToWrite);
result += CStr8(buf, bytesToWrite);
}
return result;
}
static bool isLegalUTF8(const unsigned char *source, int length) {
static bool isLegalUTF8(const unsigned char *source, int length)
{
unsigned char a;
const unsigned char *srcptr = source+length;
@@ -92,7 +94,7 @@ CStrW CStr8::FromUTF8() const
{
CStrW result;
if(empty())
if (empty())
return result;
const unsigned char* source = (const unsigned char*)&*begin();
@@ -103,12 +105,12 @@ CStrW CStr8::FromUTF8() const
unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
if (source + extraBytesToRead >= sourceEnd)
{
debug_warn("Invalid UTF-8 (fell off end)");
//debug_warn("Invalid UTF-8 (fell off end)");
return L"";
}
if (! isLegalUTF8(source, extraBytesToRead+1)) {
debug_warn("Invalid UTF-8 (illegal data)");
//debug_warn("Invalid UTF-8 (illegal data)");
return L"";
}
@@ -134,7 +136,6 @@ CStrW CStr8::FromUTF8() const
// The following code is compiled twice, as CStrW then as CStr8:
#include "CStr.h"
using namespace std;
#include <sstream>
@@ -282,7 +283,7 @@ long CStr::ReverseFind(const CStr& Str) const
// Lowercase and uppercase
CStr CStr::LowerCase() const
{
tstring NewString = *this;
std::tstring NewString = *this;
for (size_t i = 0; i < length(); i++)
NewString[i] = (tchar)_totlower((*this)[i]);
@@ -291,7 +292,7 @@ CStr CStr::LowerCase() const
CStr CStr::UpperCase() const
{
tstring NewString = *this;
std::tstring NewString = *this;
for (size_t i = 0; i < length(); i++)
NewString[i] = (tchar)_totupper((*this)[i]);
@@ -302,7 +303,7 @@ CStr CStr::UpperCase() const
// code duplication because return by value overhead if they were merely an alias
CStr CStr::LCase() const
{
tstring NewString = *this;
std::tstring NewString = *this;
for (size_t i = 0; i < length(); i++)
NewString[i] = (tchar)_totlower((*this)[i]);
@@ -311,7 +312,7 @@ CStr CStr::LCase() const
CStr CStr::UCase() const
{
tstring NewString = *this;
std::tstring NewString = *this;
for (size_t i = 0; i < length(); i++)
NewString[i] = (tchar)_totupper((*this)[i]);