mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 17:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove USHRT_MAX from ParseExtra functions (#1086)

Browse Source
This commit is contained in:
MS
2024-08-17 11:56:25 -04:00
committed by GitHub
parent 30e9e43cda
commit 9555aaba74
13 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
View File

@@ -77,10 +77,10 @@ void LegoActionControlPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[1024];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
char output[1024];
if (KeyValueStringParse(output, g_strACTION, extraCopy)) {

6
LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
View File

@@ -241,10 +241,10 @@ void LegoAnimMMPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[1024];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
char output[1024];
if (KeyValueStringParse(output, g_strANIMMAN_ID, extraCopy)) {

6
LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
View File

@@ -244,10 +244,10 @@ void MxControlPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[256];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
char output[256];
if (KeyValueStringParse(output, g_strSTYLE, extraCopy)) {