MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-27 07:15:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #124 from z33ky/mb/gcc11

Browse Source 
Fix memory errors
This commit is contained in:
Blixibon 2021-05-27 10:50:27 -05:00 committed by GitHub
commit 764f0c09e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sp/src/game/client/clientmode_shared.cpp
View File

@ -1259,7 +1259,7 @@ void ClientModeShared::FireGameEvent( IGameEvent *event )
} }
} }
if ( team == 0 && GetLocalTeam() > 0 ) if ( team == 0 && GetLocalTeam() )
{ {
bValidTeam = false; bValidTeam = false;
} }

7
sp/src/game/shared/mapbase/MapEdit.cpp
View File

@ -409,7 +409,6 @@ public:
pkvClassname = pkvClassname->GetNextKey(); pkvClassname = pkvClassname->GetNextKey();
} }
pkvClassname->deleteThis();
} }
else if (FStrEq(pNodeName, "edit")) else if (FStrEq(pNodeName, "edit"))
{ {
@ -432,7 +431,6 @@ public:
pName = pName->GetNextKey(); pName = pName->GetNextKey();
} }
pName->deleteThis();
} }
else if (FStrEq(pNodeName, "delete")) else if (FStrEq(pNodeName, "delete"))
{ {
@ -455,7 +453,6 @@ public:
pName = pName->GetNextKey(); pName = pName->GetNextKey();
} }
pName->deleteThis();
} }
else if (FStrEq(pNodeName, "fire")) else if (FStrEq(pNodeName, "fire"))
{ {
@ -525,12 +522,10 @@ public:
pkvNodeData = pkvNodeData->GetNextKey(); pkvNodeData = pkvNodeData->GetNextKey();
} }
pkvNodeData->deleteThis();
} }
pkvNode = pkvNode->GetNextKey(); pkvNode = pkvNode->GetNextKey();
} }
pkvNode->deleteThis();
} }
void SpawnMapEdit(const char *pFile = NULL) void SpawnMapEdit(const char *pFile = NULL)
@ -889,8 +884,8 @@ void CC_MapEdit_Print( const CCommand& args )
pkvNode = pkvNode->GetNextKey(); pkvNode = pkvNode->GetNextKey();
} }
pkvNode->deleteThis();
} }
pkvFile->deleteThis();
} }
} }
static ConCommand mapedit_print("mapedit_print", CC_MapEdit_Print, "Prints a mapedit file in the console."); static ConCommand mapedit_print("mapedit_print", CC_MapEdit_Print, "Prints a mapedit file in the console.");

8
sp/src/tier1/strtools.cpp
View File

@ -1420,7 +1420,7 @@ int V_UCS2ToUnicode( const ucs2 *pUCS2, wchar_t *pUnicode, int cubDestSizeInByte
size_t nMaxUTF8 = cubDestSizeInBytes; size_t nMaxUTF8 = cubDestSizeInBytes;
char *pIn = (char *)pUCS2; char *pIn = (char *)pUCS2;
char *pOut = (char *)pUnicode; char *pOut = (char *)pUnicode;
if ( conv_t > 0 ) if ( conv_t )
{ {
cchResult = 0; cchResult = 0;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 ); cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );
@ -1461,7 +1461,7 @@ int V_UnicodeToUCS2( const wchar_t *pUnicode, int cubSrcInBytes, char *pUCS2, in
size_t nMaxUCS2 = cubDestSizeInBytes; size_t nMaxUCS2 = cubDestSizeInBytes;
char *pIn = (char*)pUnicode; char *pIn = (char*)pUnicode;
char *pOut = pUCS2; char *pOut = pUCS2;
if ( conv_t > 0 ) if ( conv_t )
{ {
cchResult = 0; cchResult = 0;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUCS2 ); cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUCS2 );
@ -1508,7 +1508,7 @@ int V_UCS2ToUTF8( const ucs2 *pUCS2, char *pUTF8, int cubDestSizeInBytes )
size_t nMaxUTF8 = cubDestSizeInBytes - 1; size_t nMaxUTF8 = cubDestSizeInBytes - 1;
char *pIn = (char *)pUCS2; char *pIn = (char *)pUCS2;
char *pOut = (char *)pUTF8; char *pOut = (char *)pUTF8;
if ( conv_t > 0 ) if ( conv_t )
{ {
cchResult = 0; cchResult = 0;
const size_t nBytesToWrite = nMaxUTF8; const size_t nBytesToWrite = nMaxUTF8;
@ -1554,7 +1554,7 @@ int V_UTF8ToUCS2( const char *pUTF8, int cubSrcInBytes, ucs2 *pUCS2, int cubDest
size_t nMaxUTF8 = cubDestSizeInBytes; size_t nMaxUTF8 = cubDestSizeInBytes;
char *pIn = (char *)pUTF8; char *pIn = (char *)pUTF8;
char *pOut = (char *)pUCS2; char *pOut = (char *)pUCS2;
if ( conv_t > 0 ) if ( conv_t )
{ {
cchResult = 0; cchResult = 0;
cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 ); cchResult = iconv( conv_t, &pIn, &nLenUnicde, &pOut, &nMaxUTF8 );