OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Replace ZEROPTR() with memset.

Browse Source
This commit is contained in:
Darryl Pogue
2012-01-20 23:42:39 -08:00
committed by Adam Johnson
parent 3c5ed83020
commit 30430d3024
10 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/CoreLib/hsMalloc.h
View File

@ -166,8 +166,6 @@ inline void CDECL operator delete (void *, void *) {}
#define ALLOCZERO(b) MemAlloc(b, kMemZero, __FILE__, __LINE__) #define ALLOCZERO(b) MemAlloc(b, kMemZero, __FILE__, __LINE__)
#define ZERO(s) MemSet(&s, 0, sizeof(s)) #define ZERO(s) MemSet(&s, 0, sizeof(s))
#define ZEROPTR(p) MemSet(p, 0, sizeof(*p))
#ifdef __cplusplus #ifdef __cplusplus

4
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
View File

@ -196,8 +196,8 @@ static void SocketGetAddresses (
NetAddress * remoteAddr NetAddress * remoteAddr
) { ) {
// NetAddress may be bigger than sockaddr_in so start by zeroing the whole thing // NetAddress may be bigger than sockaddr_in so start by zeroing the whole thing
ZEROPTR(localAddr); memset(localAddr, 0, sizeof(*localAddr));
ZEROPTR(remoteAddr); memset(remoteAddr, 0, sizeof(*remoteAddr));
// don't have to enter critsect or validate socket before referencing it // don't have to enter critsect or validate socket before referencing it
// because this routine is called before the user has a chance to close it // because this routine is called before the user has a chance to close it

4
Sources/Plasma/NucleusLib/pnCrashExe/Win32/pnCreTools.cpp
View File

@ -66,7 +66,7 @@ static BOOL MYIMAGEAPI iSymGetModuleInfo (
DWORD, DWORD,
IMAGEHLP_MODULE * ModuleInfo IMAGEHLP_MODULE * ModuleInfo
) { ) {
ZEROPTR(ModuleInfo); memset(ModuleInfo, 0, sizeof(*ModuleInfo));
return false; return false;
} }
@ -109,7 +109,7 @@ static BOOL MYIMAGEAPI iSymGetSymFromAddr (
PIMAGEHLP_SYMBOL Symbol PIMAGEHLP_SYMBOL Symbol
) { ) {
*Displacement = 0; *Displacement = 0;
ZEROPTR(Symbol); memset(Symbol, 0, sizeof(*Symbol));
return false; return false;
} }

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp
View File

@ -83,7 +83,7 @@ bool Srv2DbValidateConnect (
return false; return false;
} }
ZEROPTR(connectPtr); memset(connectPtr, 0, sizeof(*connectPtr));
MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes));
listen->bytesProcessed += connect.dataBytes; listen->bytesProcessed += connect.dataBytes;

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp
View File

@ -79,7 +79,7 @@ bool Srv2LogValidateConnect (
connect.srvType == kSrvTypeMcp || connect.srvType == kSrvTypeState || connect.srvType == kSrvTypeFile || connect.srvType == kSrvTypeDll)) connect.srvType == kSrvTypeMcp || connect.srvType == kSrvTypeState || connect.srvType == kSrvTypeFile || connect.srvType == kSrvTypeDll))
return false; return false;
ZEROPTR(connectPtr); memset(connectPtr, 0, sizeof(*connectPtr));
MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes));
listen->bytesProcessed += connect.dataBytes; listen->bytesProcessed += connect.dataBytes;

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp
View File

@ -77,7 +77,7 @@ bool Srv2McpValidateConnect (
if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame)) if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame))
return false; return false;
ZEROPTR(connectPtr); memset(connectPtr, 0, sizeof(*connectPtr));
MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes));
listen->bytesProcessed += connect.dataBytes; listen->bytesProcessed += connect.dataBytes;

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.cpp
View File

@ -78,7 +78,7 @@ bool Srv2ScoreValidateConnect (
if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame)) if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame))
return false; return false;
ZEROPTR(connectPtr); memset(connectPtr, 0, sizeof(*connectPtr));
MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes));
listen->bytesProcessed += connect.dataBytes; listen->bytesProcessed += connect.dataBytes;

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.cpp
View File

@ -78,7 +78,7 @@ bool Srv2StateValidateConnect (
if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame)) if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame))
return false; return false;
ZEROPTR(connectPtr); memset(connectPtr, 0, sizeof(*connectPtr));
MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes));
listen->bytesProcessed += connect.dataBytes; listen->bytesProcessed += connect.dataBytes;

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp
View File

@ -77,7 +77,7 @@ bool Srv2VaultValidateConnect (
if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame || connect.srvType == kSrvTypeMcp)) if (!(connect.srvType == kSrvTypeAuth || connect.srvType == kSrvTypeGame || connect.srvType == kSrvTypeMcp))
return false; return false;
ZEROPTR(connectPtr); memset(connectPtr, 0, sizeof(*connectPtr));
MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes)); MemCopy(connectPtr, &connect, min(sizeof(*connectPtr), connect.dataBytes));
listen->bytesProcessed += connect.dataBytes; listen->bytesProcessed += connect.dataBytes;

4
Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp
View File

@ -229,7 +229,7 @@ bool NetAddressFromString (NetAddress * addr, const wchar_t str[], unsigned defa
ASSERT(str); ASSERT(str);
// NetAddress is bigger than sockaddr_in so start by zeroing the whole thing // NetAddress is bigger than sockaddr_in so start by zeroing the whole thing
ZEROPTR(addr); memset(addr, 0, sizeof(*addr));
for (;;) { for (;;) {
NetAddressNode node = NodeFromString(&str); NetAddressNode node = NodeFromString(&str);
@ -278,7 +278,7 @@ void NetAddressFromNode (
unsigned port, unsigned port,
NetAddress * addr NetAddress * addr
) { ) {
ZEROPTR(addr); memset(addr, 0, sizeof(*addr));
sockaddr_in * inetaddr = (sockaddr_in *) addr; sockaddr_in * inetaddr = (sockaddr_in *) addr;
inetaddr->sin_family = AF_INET; inetaddr->sin_family = AF_INET;
inetaddr->sin_addr.S_un.S_addr = htonl(node); inetaddr->sin_addr.S_un.S_addr = htonl(node);