Backups/SA-MP
1
0
Fork 0
mirror of https://github.com/dashr9230/SA-MP.git synced 2026-10-10 11:43:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[saco] Match FUNC_1001B070; the count is read into an int before the guard and copied to the loop variable inside it, which is what sinks the store past the branch

Browse Source
This commit is contained in:
ricardoofnl
2026-09-05 10:46:01 +07:00
parent e29832070a
commit d7ac8188fa
2 changed files with 87 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
saco/net/objectpool.h
+3
View File
@@ -21,6 +21,9 @@ public:
void FUNC_100A9E70();
void FUNC_100A80A0(VECTOR *pPos); // .text:100A80A0
void FUNC_100A8030(); // .text:100A8030
void FUNC_100A8530(int iModel, int iIndex, char *szTxd, char *szTexture, DWORD dwColour); // .text:100A8530
void FUNC_100A86B0(int iIndex, char *szText, BYTE byteSize, char *szFont, BYTE byteBold,
BYTE byteAlign, DWORD dwFontColour, DWORD dwBackColour, BYTE byteUnk); // .text:100A86B0
};
class CObjectPool
saco/net/scriptrpc.cpp
+84
View File
@@ -165,6 +165,90 @@ void ScrUnk94(RPCParameters *rpcParams)
}
}
void ScrUnk95(RPCParameters *rpcParams) {}
// the object at 0x10053C30; only the bitstream string reader this file needs
class CScrStringReader
{
public:
bool FUNC_100542D0(char *szBuffer, int iMaxLen, RakNet::BitStream *pData, int a4); // .text:100542D0
};
CScrStringReader * FUNC_10053C30(); // .text:10053C30
// walks byteCount material entries off the wire and applies them to pObject
void FUNC_1001B070(BYTE byteCount, CObject *pObject, RakNet::BitStream *pData)
{
BYTE byteLen;
BYTE byteIndex;
BYTE byteType;
WORD wModel;
DWORD dwColour;
int iCount;
DWORD dwFontColour;
BYTE byteSize;
BYTE byteAlign;
BYTE byteBold;
BYTE byteUnk;
DWORD dwBackColour;
int iTextLen;
char szTxd[257];
char szFont[257];
char szTexture[257];
char szText[2049];
int iEntries = byteCount;
dwColour = 0;
byteLen = 0;
if(iEntries) {
iCount = iEntries;
do {
memset(szTxd, 0, sizeof(szTxd));
memset(szTexture, 0, sizeof(szTexture));
memset(szFont, 0, sizeof(szFont));
memset(szText, 0, sizeof(szText));
pData->Read(byteType);
if(byteType == 1) {
pData->Read(byteIndex);
pData->Read(wModel);
pData->Read(byteLen);
pData->Read(szTxd, byteLen);
pData->Read(byteLen);
pData->Read(szTexture, byteLen);
pData->Read(dwColour);
if(strlen(szTxd) < 32 && strlen(szTexture) < 32) {
int iModel = wModel;
if(iModel == 0xFFFF || iModel > 20000) iModel = -1;
if(pObject) pObject->FUNC_100A8530(iModel, byteIndex, szTxd, szTexture, dwColour);
}
} else if(byteType == 2) {
pData->Read(byteIndex);
pData->Read(byteSize);
pData->Read(byteLen);
pData->Read(szFont, byteLen);
pData->Read(byteBold);
pData->Read(byteAlign);
pData->Read(dwFontColour);
pData->Read(dwBackColour);
pData->Read(byteUnk);
FUNC_10053C30()->FUNC_100542D0(szText, 2048, pData, 0);
if(strlen(szFont) < 32) {
iTextLen = strlen(szText);
if(iTextLen) {
if(pObject) pObject->FUNC_100A86B0(byteIndex, szText, byteSize, szFont,
byteBold, byteAlign, dwFontColour, dwBackColour, byteUnk);
}
}
}
} while(--iCount);
}
}
void ScrUnk2C(RPCParameters *rpcParams) {}
void ScrUnk2D(RPCParameters *rpcParams)
{