Get rid of most _alloca use and remove ALLOCA().

Sources/Plasma/CoreLib/hsMalloc.h

@@ -174,8 +174,6 @@ inline void CDECL operator delete (void *, void *) {}
 #define MEMDUP(s, b)            MemDup(s, b, 0, __FILE__, __LINE__)
 #define ZERO(s)                 MemSet(&s, 0, sizeof(s))
 #define ZEROPTR(p)              MemSet(p, 0, sizeof(*p))
-// Client must #include <malloc.h>
-#define  ALLOCA(t, n)           (t *)_alloca((n) * sizeof(t))
 
 
 #ifdef __cplusplus

Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp

@@ -415,7 +415,7 @@ void pfGameMgr::CreateGame (
         - sizeof(msg->createData)
         + initBytes;
         
-    msg = (Cli2Srv_GameMgr_CreateGame *)_alloca(msgBytes);
+    msg = (Cli2Srv_GameMgr_CreateGame *)malloc(msgBytes);
         
     msg->messageId          = kCli2Srv_GameMgr_CreateGame;
     msg->recvGameId         = 0;            // send to GameMgr on server
@@ -426,6 +426,8 @@ void pfGameMgr::CreateGame (
     MemCopy(msg->createData, initData, initBytes);
 
     GameMgrSend(msg, NEWZERO(JoinTransState)(receiver));
+
+    free(msg);
 }
 
 //============================================================================
@@ -443,7 +445,7 @@ void pfGameMgr::JoinCommonGame (
         - sizeof(msg->createData)
         + initBytes;
         
-    msg = (Cli2Srv_GameMgr_JoinGame *)_alloca(msgBytes);
+    msg = (Cli2Srv_GameMgr_JoinGame *)malloc(msgBytes);
         
     msg->messageId          = kCli2Srv_GameMgr_JoinGame;
     msg->recvGameId         = 0;            // send to GameMgr on server
@@ -455,6 +457,8 @@ void pfGameMgr::JoinCommonGame (
     MemCopy(msg->createData, initData, initBytes);
 
     GameMgrSend(msg, NEWZERO(JoinTransState)(receiver));
+
+    free(msg);
 }
 
 

Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Dns.cpp

@@ -90,41 +90,40 @@ static unsigned                 s_nextLookupCancelId = 1;
 static void LookupProcess (Lookup * lookup, unsigned error) {
     unsigned count      = 0;
     NetAddress * addrs  = nil;
-    for (ONCE) {
-        if (error)
-            break;
 
-        const HOSTENT & host = * (HOSTENT *) lookup->buffer;
+    if (error)
-        if (host.h_addrtype != AF_INET)
+        return;
-            break;
-        if (host.h_length != sizeof(in_addr))
-            break;
-        if (!host.h_addr_list)
-            break;
 
-        in_addr const * const * const inAddr = (in_addr **) host.h_addr_list;
+    const HOSTENT & host = * (HOSTENT *) lookup->buffer;
+    if (host.h_addrtype != AF_INET)
+        return;
+    if (host.h_length != sizeof(in_addr))
+        return;
+    if (!host.h_addr_list)
+        return;
 
-        // count the number of addresses
+    in_addr const * const * const inAddr = (in_addr **) host.h_addr_list;
-        while (inAddr[count])
-            ++count;
 
-        // allocate a buffer large enough to hold all the addresses
+    // count the number of addresses
-        addrs = (NetAddress *) _alloca(sizeof(*addrs) * count);
+    while (inAddr[count])
-        MemZero(addrs, sizeof(*addrs) * count);
+        ++count;
 
-        // fill in address data
+    // allocate a buffer large enough to hold all the addresses
-        const uint16_t port = htons((uint16_t) lookup->port);
+    addrs = (NetAddress *)malloc(sizeof(*addrs) * count);
-        for (unsigned i = 0; i < count; ++i) {
+    MemZero(addrs, sizeof(*addrs) * count);
-            sockaddr_in * inetaddr = (sockaddr_in *) &addrs[i];
-            inetaddr->sin_family    = AF_INET;
-            inetaddr->sin_addr      = *inAddr[i];
-            inetaddr->sin_port      = port;
-        }
 
-        if (host.h_name && host.h_name[0])
+    // fill in address data
-            StrToUnicode(lookup->name, host.h_name, arrsize(lookup->name));
+    const uint16_t port = htons((uint16_t) lookup->port);
+    for (unsigned i = 0; i < count; ++i) {
+        sockaddr_in * inetaddr = (sockaddr_in *) &addrs[i];
+        inetaddr->sin_family    = AF_INET;
+        inetaddr->sin_addr      = *inAddr[i];
+        inetaddr->sin_port      = port;
     }
 
+    if (host.h_name && host.h_name[0])
+        StrToUnicode(lookup->name, host.h_name, arrsize(lookup->name));
+
     if (lookup->lookupProc)
         lookup->lookupProc(lookup->param, lookup->name, count, addrs);
 
@@ -134,6 +133,8 @@ static void LookupProcess (Lookup * lookup, unsigned error) {
     ASSERT(!lookup->link.IsLinked());
     delete lookup;
     PerfSubCounter(kAsyncPerfNameLookupAttemptsCurr, 1);
+
+    free(addrs);
 }
 
 //===========================================================================

Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp

@@ -99,9 +99,11 @@ static void AddValueString (
     const wchar_t src[]
 ) {
     unsigned chars = StrLen(src) + 1;
-    wchar_t * dst = ALLOCA(wchar_t, chars);
+    wchar_t * dst = (wchar_t*)malloc(sizeof(wchar_t) * chars);
     StrTokenize(&src, dst, chars, L" \t\r\n\"");
     value->fArgs.Add(StrDup(dst));
+
+    free(dst);
 }
 
 

Sources/Plasma/NucleusLib/pnMail/pnMail.cpp

@@ -212,10 +212,12 @@ static bool AdvanceStep (
                 ++start;
             const char * term = StrChr(start, ';');
             if (term) {
-                char * buffer = ALLOCA(char, term + 1 - start);
+                char * buffer = (char*)malloc(term + 1 - start);
                 StrCopy(buffer, start, term + 1 - start);
                 Send(sock, "rcpt to:<", buffer, ">\r\n", nil);
                 transaction->subStep = term + 1 - transaction->recipient;
+
+                free(buffer);
             }
             else {
                 Send(sock, "rcpt to:<", start, ">\r\n", nil);
@@ -445,12 +447,7 @@ static void __cdecl Send (
     }
 
     // Allocate string buffer
-    char * packed;
+    char* packed = (char *) malloc(bytes);
-    const unsigned kStackBufSize = 8 * 1024;
-    if (bytes > kStackBufSize)
-        packed = (char *) malloc(bytes);
-    else
-        packed = (char *) _alloca(bytes);
 
     // Pack the string
     {
@@ -466,8 +463,7 @@ static void __cdecl Send (
     AsyncSocketSend(sock, packed, bytes - 1);
 
     // Free the string
-    if (bytes > kStackBufSize)
+    free(packed);
-        free(packed);
 }
 
 //===========================================================================

Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp

@@ -169,7 +169,7 @@ namespace pnNetCli {
 //============================================================================
 static void PutBufferOnWire (NetCli * cli, void * data, unsigned bytes) {
 
-        uint8_t * temp, * heap = NULL;
+    uint8_t * temp = NULL;
 
 #ifndef PLASMA_EXTERNAL_RELEASE
     // Write to the netlog
@@ -189,13 +189,7 @@ static void PutBufferOnWire (NetCli * cli, void * data, unsigned bytes) {
 #endif // PLASMA_EXTERNAL_RELEASE
 
     if (cli->mode == kNetCliModeEncrypted && cli->cryptOut) {
-        // Encrypt data...
+        temp = (uint8_t *)malloc(bytes);
-        if (bytes <= 2048)
-            // uint8_t count is small, use stack-based buffer
-            temp = ALLOCA(uint8_t, bytes);
-        else
-            // uint8_t count is large, use heap-based buffer
-            temp = heap = (uint8_t *)malloc(bytes);
 
         MemCopy(temp, data, bytes);
         CryptEncrypt(cli->cryptOut, bytes, temp);
@@ -205,7 +199,7 @@ static void PutBufferOnWire (NetCli * cli, void * data, unsigned bytes) {
         AsyncSocketSend(cli->sock, data, bytes);
         
     // free heap buffer (if any)
-    free(heap);
+    free(temp);
 }
 
 //============================================================================
@@ -295,7 +289,7 @@ static void BufferedSendData (
             case kNetMsgFieldInteger: {
                 const unsigned count = cmd->count ? cmd->count : 1;
                 const unsigned bytes = cmd->size * count;
-                void * temp = ALLOCA(uint8_t, bytes);
+                void * temp = malloc(bytes);
                 
                 if (count == 1)
                 {
@@ -328,6 +322,8 @@ static void BufferedSendData (
                 
                 // Write values to send buffer
                 AddToSendBuffer(cli, bytes, temp);
+
+                free(temp);
             }
             break;
 
@@ -1112,15 +1108,10 @@ bool NetCliDispatch (
     do {
         if (cli->mode == kNetCliModeEncrypted) {
             // Decrypt data...
-            uint8_t * temp, * heap = NULL;
+            uint8_t * temp = NULL;
 
             if (cli->cryptIn) {
-                if (bytes <= 2048)
+                temp = (uint8_t *)malloc(bytes);
-                    // uint8_t count is small, use stack-based buffer
-                    temp = ALLOCA(uint8_t, bytes);
-                else
-                    // uint8_t count is large, use heap-based buffer
-                    temp = heap = (uint8_t *)malloc(bytes);
 
                 MemCopy(temp, data, bytes);
                 CryptDecrypt(cli->cryptIn, bytes, temp);
@@ -1153,7 +1144,7 @@ bool NetCliDispatch (
 #endif
             
             // free heap buffer (if any)
-            free(heap);
+            free(temp);
 
             cli->input.Compact();
             return cli->recvDispatch;

Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp

@@ -991,9 +991,10 @@ void NetVaultNodeFieldArray::GetFieldValueString_LCS (
         case NetVaultNode::kString64_6:
         case NetVaultNode::kIString64_1:
         case NetVaultNode::kIString64_2: {
-            wchar_t * tmp = ALLOCA(wchar_t, dstChars);
+            wchar_t * tmp = (wchar_t*)malloc(sizeof(wchar_t) * dstChars);
             IStrSqlEscape(*(wchar_t **)fieldAddr, tmp, dstChars);
             StrPrintf(dst, dstChars, L"'%s'", tmp);
+            free(tmp);
         }
         break;
 

Sources/Plasma/NucleusLib/pnOraLib/pnOraLib.cpp

@@ -458,9 +458,11 @@ void OraGetUuid (
     occi::Bytes bytes = oraStmt->getBytes(index);
     if (const unsigned length = bytes.length()) {
         ASSERT(length == msizeof(Uuid, data));
-        uint8_t * buf = ALLOCA(uint8_t, length);
+        uint8_t * buf = malloc(length);
         bytes.getBytes(buf, length);
         GuidFromHex(buf, length, uuid);
+
+        free(buf)
     }
     else {
         GuidClear(uuid);

Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp

@@ -355,7 +355,7 @@ unsigned NetAddressGetLocal (
         // Create a buffer to sort the addresses
         NetAddressNode * dst;
         if (found > count)
-            dst = ALLOCA(NetAddressNode, found);
+            dst = (NetAddressNode*)_alloca(found * sizeof(NetAddressNode));
         else
             dst = addresses;
 

Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp

@@ -96,36 +96,38 @@ void MemoryGetStatus (MemoryStatus * status) {
 
 //============================================================================
 void DiskGetStatus (ARRAY(DiskStatus) * disks) {
-    for (;;) {
+    DWORD length = GetLogicalDriveStrings(0, NULL);
-        DWORD length = GetLogicalDriveStrings(0, NULL);
+    if (!length || length > 2048)
-        if (!length || length > 2048)
+        return;
-            break;
+
-
+    wchar_t* buffer = (wchar_t*)malloc((length + 1) * sizeof(wchar_t));
-        wchar_t * buffer = ALLOCA(wchar_t, length + 1);
+    wchar_t* origbuf = buffer;
-        if (!GetLogicalDriveStringsW(length, buffer))
+    if (!GetLogicalDriveStringsW(length, buffer))
-            break;
+    {
-
+        free(buffer);
-        for (; *buffer; buffer += StrLen(buffer) + 1) {
+        return;
-            UINT driveType = GetDriveTypeW(buffer);
-            if (driveType != DRIVE_FIXED)
-                continue;
-
-            ULARGE_INTEGER freeBytes;
-            ULARGE_INTEGER totalBytes;
-            if (!GetDiskFreeSpaceExW(buffer, &freeBytes, &totalBytes, NULL))
-                continue;
-
-            DiskStatus status;
-            StrCopy(status.name, buffer, arrsize(status.name));
-
-            const uint64_t BYTES_PER_MB = 1024 * 1024;
-            status.totalSpaceMB = unsigned(totalBytes.QuadPart / BYTES_PER_MB);
-            status.freeSpaceMB  = unsigned(freeBytes.QuadPart  / BYTES_PER_MB);
-
-            disks->Add(status);
-        }
-        break;
     }
+
+    for (; *buffer; buffer += StrLen(buffer) + 1) {
+        UINT driveType = GetDriveTypeW(buffer);
+        if (driveType != DRIVE_FIXED)
+            continue;
+
+        ULARGE_INTEGER freeBytes;
+        ULARGE_INTEGER totalBytes;
+        if (!GetDiskFreeSpaceExW(buffer, &freeBytes, &totalBytes, NULL))
+            continue;
+
+        DiskStatus status;
+        StrCopy(status.name, buffer, arrsize(status.name));
+
+        const uint64_t BYTES_PER_MB = 1024 * 1024;
+        status.totalSpaceMB = unsigned(totalBytes.QuadPart / BYTES_PER_MB);
+        status.freeSpaceMB  = unsigned(freeBytes.QuadPart  / BYTES_PER_MB);
+
+        disks->Add(status);
+    }
+    free(origbuf);
 }
 
 //============================================================================

Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp

@@ -166,9 +166,11 @@ static void Rc4Codec (
     void *          data
 ) {
     // RC4 uses the same algorithm to both encrypt and decrypt
-    uint8_t * temp = ALLOCA(uint8_t, bytes);
+    uint8_t * temp = (uint8_t *)malloc(bytes);
     RC4((RC4_KEY *)key->handle, bytes, (const unsigned char *)data, temp);
     MemCopy(data, temp, bytes);
+
+    free(temp);
 }
 
 } using namespace Crypt;
@@ -337,7 +339,7 @@ void CryptHashPassword (
     unsigned passlen = StrLen(password);
     unsigned userlen = StrLen(username);
 
-    wchar_t * buffer = ALLOCA(wchar_t, passlen + userlen);
+    wchar_t * buffer = (wchar_t*)malloc(sizeof(wchar_t) * (passlen + userlen));
     StrCopy(buffer, password, passlen);
     StrCopy(buffer + passlen, username, userlen);
     StrLower(buffer + passlen); // lowercase the username
@@ -348,6 +350,8 @@ void CryptHashPassword (
         (userlen + passlen) * sizeof(buffer[0]),
         buffer
     );
+
+    free(buffer);
 }
 
 //============================================================================

Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp

@@ -234,7 +234,7 @@ void PathSplitEmail (
         return;
 
     // copy email address so we can tokenize it
-    wchar_t * tmp = ALLOCA(wchar_t, len + 1);
+    wchar_t * tmp = (wchar_t*)malloc(sizeof(wchar_t) * (len + 1));
     StrCopy(tmp, emailAddr, len + 1);
     const wchar_t * work = tmp;
 
@@ -255,9 +255,11 @@ void PathSplitEmail (
     ARRAY(wchar_t *) arr;
     while (StrTokenize(&work, token, arrsize(token), L".")) {
         unsigned toklen = StrLen(token);
-        wchar_t * str = ALLOCA(wchar_t, toklen + 1);
+        wchar_t * str = (wchar_t*)malloc(sizeof(wchar_t) * (toklen + 1));
         StrCopy(str, token, toklen + 1);
         arr.Add(str);
+
+        free(str);
     }
 
     // copy domains to output parameters
@@ -286,5 +288,7 @@ void PathSplitEmail (
                 StrCopy(&SUB_DOMAIN(index), arr[index], subDomainChars);
     }
 
+    free(tmp);
+    
     #undef SUB_DOMAIN
 }

Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp

@@ -81,7 +81,7 @@ unsigned GuidHash (const Uuid & uuid) {
 static const wchar_t s_hexChars[] = L"0123456789ABCDEF";
 const wchar_t * GuidToHex (const Uuid & uuid, wchar_t * dst, unsigned chars) {
     
-    wchar_t * str = ALLOCA(wchar_t, sizeof(uuid.data) * 2 + 1);
+    wchar_t * str = (wchar_t*)malloc((sizeof(uuid.data) * 2 + 1) * sizeof(wchar_t));
     wchar_t * cur = str;
     
     for (unsigned i = 0; i < sizeof(uuid.data); ++i) {
@@ -91,6 +91,8 @@ const wchar_t * GuidToHex (const Uuid & uuid, wchar_t * dst, unsigned chars) {
     *cur = 0;
     
     StrCopy(dst, str, chars);
+
+    free(str);
     return dst;
 }
 

Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp

@@ -1084,7 +1084,7 @@ void NetCommSendMsg (
     msg->SetPlayerID(NetCommGetPlayer()->playerInt);
 
     unsigned msgSize = msg->GetPackSize();
-    uint8_t * buf = ALLOCA(uint8_t, msgSize);
+    uint8_t * buf = (uint8_t *)malloc(msgSize);
     msg->PokeBuffer((char *)buf, msgSize);
 
     switch (msg->GetNetProtocol()) {
@@ -1106,6 +1106,8 @@ void NetCommSendMsg (
 
         DEFAULT_FATAL(msg->GetNetProtocol());
     }
+
+    free(buf);
 }
 
 //============================================================================

Sources/Plasma/PubUtilLib/plVault/plVaultNodeAccess.cpp

@@ -566,17 +566,14 @@ void VaultSDLNode::SetStateDataRecord (const plStateDataRecord * rec, unsigned w
     ram.Rewind();
     
     unsigned bytes = ram.GetEOF();
-    uint8_t * buf, * heap = nil;
+    uint8_t * buf = nil;
-    if (bytes <= 2048)
+    buf = (uint8_t *)malloc(bytes);
-        buf = ALLOCA(uint8_t, bytes);
-    else
-        buf = (uint8_t *)ALLOC(bytes);
 
     ram.CopyToMem(buf);     
     
     IVaultNodeSetBlob(kSDLData, base, &sdlData, &sdlDataLen, buf, bytes);
     
-    free(heap);
+    free(buf);
 }
 #endif // def CLIENT