mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-22 16: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)) {

6
LEGO1/lego/legoomni/src/control/legometerpresenter.cpp
View File

@@ -40,10 +40,10 @@ void LegoMeterPresenter::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_strTYPE, extraCopy)) {

6
LEGO1/lego/legoomni/src/entity/legoactorpresenter.cpp
View File

@@ -34,10 +34,10 @@ void LegoActorPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
m_entity->ParseAction(extraCopy);
}

6
LEGO1/lego/legoomni/src/entity/legoentitypresenter.cpp
View File

@@ -96,10 +96,10 @@ void LegoEntityPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
m_entity->ParseAction(extraCopy);
}

6
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@@ -429,10 +429,10 @@ void LegoWorldPresenter::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_strWORLD, extraCopy)) {

6
LEGO1/lego/legoomni/src/paths/legopathpresenter.cpp
View File

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

12
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@@ -942,18 +942,18 @@ void LegoAnimPresenter::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(NULL, g_strFROM_PARENT, extraCopy) && m_compositePresenter != NULL) {
m_compositePresenter->GetAction()->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
if (extraLength) {
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
}
}

6
LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp
View File

@@ -297,11 +297,11 @@ void LegoModelPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[1024], output[1024];
output[0] = '\0';
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
if (KeyValueStringParse(output, g_strAUTO_CREATE, extraCopy) != 0) {
char* token = strtok(output, g_parseExtraTokens);

6
LEGO1/omni/src/audio/mxwavepresenter.cpp
View File

@@ -331,10 +331,10 @@ void MxWavePresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
char soundValue[512];
if (KeyValueStringParse(soundValue, g_strSOUND, extraCopy)) {

12
LEGO1/omni/src/common/mxpresenter.cpp
View File

@@ -87,10 +87,10 @@ void MxPresenter::ParseExtra()
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
char worldValue[512];
if (KeyValueStringParse(worldValue, g_strWORLD, extraCopy)) {
@@ -251,10 +251,10 @@ MxEntity* MxPresenter::CreateEntity(const char* p_defaultName)
char* extraData;
m_action->GetExtra(extraLength, extraData);
if (extraLength & USHRT_MAX) {
if (extraLength) {
char extraCopy[512];
memcpy(extraCopy, extraData, extraLength & USHRT_MAX);
extraCopy[extraLength & USHRT_MAX] = '\0';
memcpy(extraCopy, extraData, extraLength);
extraCopy[extraLength] = '\0';
KeyValueStringParse(objectName, g_strOBJECT, extraCopy);
}

6
LEGO1/omni/src/video/mxstillpresenter.cpp
View File

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