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

Don't assume vault strings are null-terminated

Browse Source
This commit is contained in:
Adam Johnson
2015-01-02 21:12:16 -05:00
parent 3e46ea6811
commit 352c9f9427
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp
View File

@ -425,11 +425,13 @@ template<>
static void IRead<plString>(const uint8_t*& buf, plString& dest) static void IRead<plString>(const uint8_t*& buf, plString& dest)
{ {
uint32_t size = *(reinterpret_cast<const uint32_t*>(buf)); uint32_t size = *(reinterpret_cast<const uint32_t*>(buf));
uint32_t arraySize = size / 2;
buf += sizeof(uint32_t); buf += sizeof(uint32_t);
plStringBuffer<uint16_t> str; plStringBuffer<uint16_t> str;
uint16_t* theStrBuffer = str.CreateWritableBuffer(size / sizeof(uint16_t)); uint16_t* theStrBuffer = str.CreateWritableBuffer(arraySize - 1);
memcpy(theStrBuffer, buf, size); memcpy(theStrBuffer, buf, size);
theStrBuffer[arraySize - 1] = 0;
dest = plString::FromUtf16(str); dest = plString::FromUtf16(str);
buf += size; buf += size;
} }