Changeset View
Changeset View
Standalone View
Standalone View
source/ps/CStr.cpp
Show First 20 Lines • Show All 461 Lines • ▼ Show 20 Lines | for (i = 0; i < len; i++) | ||||
*(u16 *)(buffer + i*2) = bigEndian; | *(u16 *)(buffer + i*2) = bigEndian; | ||||
} | } | ||||
*(u16 *)(buffer + i*2) = 0; | *(u16 *)(buffer + i*2) = 0; | ||||
return buffer + len*2 + 2; | return buffer + len*2 + 2; | ||||
} | } | ||||
const u8* CStrW::Deserialize(const u8* buffer, const u8* bufferend) | const u8* CStrW::Deserialize(const u8* buffer, const u8* bufferend) | ||||
{ | { | ||||
ENSURE(buffer); | |||||
ENSURE(bufferend); | |||||
const u16 *strend = (const u16 *)buffer; | const u16 *strend = (const u16 *)buffer; | ||||
while ((const u8 *)strend < bufferend && *strend) strend++; | while ((const u8 *)strend < bufferend && *strend) strend++; | ||||
if ((const u8 *)strend >= bufferend) return NULL; | if ((const u8 *)strend >= bufferend) return NULL; | ||||
resize(strend - (const u16 *)buffer); | resize(strend - (const u16 *)buffer); | ||||
const u16 *ptr = (const u16 *)buffer; | const u16 *ptr = (const u16 *)buffer; | ||||
std::wstring::iterator str = begin(); | std::wstring::iterator str = begin(); | ||||
Show All 24 Lines | u8* CStr8::Serialize(u8* buffer) const | ||||
size_t i = 0; | size_t i = 0; | ||||
for (i = 0; i < len; i++) | for (i = 0; i < len; i++) | ||||
buffer[i] = (*this)[i]; | buffer[i] = (*this)[i]; | ||||
return buffer + len; | return buffer + len; | ||||
} | } | ||||
const u8* CStr8::Deserialize(const u8* buffer, const u8* bufferend) | const u8* CStr8::Deserialize(const u8* buffer, const u8* bufferend) | ||||
{ | { | ||||
ENSURE(buffer); | |||||
ENSURE(bufferend); | |||||
elexis: Could also silently deserialize emptystring.
As for consistency, there are two ENSURE in this… | |||||
Not Done Inline ActionsEither remove this or also add it to CStrW imo. wraitii: Either remove this or also add it to CStrW imo. | |||||
u32 len; | u32 len; | ||||
Deserialize_int_4(buffer, len); | Deserialize_int_4(buffer, len); | ||||
if (buffer + len > bufferend) | if (buffer + len > bufferend) | ||||
return NULL; | return NULL; | ||||
*this = std::string(buffer, buffer + len); | *this = std::string(buffer, buffer + len); | ||||
return buffer + len; | return buffer + len; | ||||
} | } | ||||
Show All 17 Lines |
Wildfire Games · Phabricator
Could also silently deserialize emptystring.
As for consistency, there are two ENSURE in this file already.