Changeset 6135

Timestamp:

04/08/08 02:42:55 (8 months ago)

Author:

flynd

Message:

Don't allocate variable sized arrays on stack. Patch from #1504 to fix some compiler warnings.

Location:

trunk/licq/src

Files:

• icqd-chat.cpp (modified) (4 diffs)
• icqd-srv.cpp (modified) (3 diffs)
• icqd-tcp.cpp (modified) (24 diffs)
• icqd.cpp (modified) (8 diffs)
• onevent.cpp (modified) (1 diff)

trunk/licq/src/icqd-chat.cpp

@@ -1292 +1292 @@
          sizeFontName = u->chatQueue[1] | (u->chatQueue[2] << 8);
          if (u->chatQueue.size() < (unsigned long)(sizeFontName + 2 + 3)) return true;
-         char nameFont[sizeFontName + 1];
+         char* nameFont = new char[sizeFontName + 1];
          for (i = 0; i < sizeFontName; i++)
             nameFont[i] = u->chatQueue[i + 3];
@@ -1306 +1306 @@
 
          PushChatEvent(new CChatEvent(CHAT_FONTxFAMILY, u));
+         delete [] nameFont;
          break;
       }
@@ -1605 +1606 @@
            unsigned short sizeFontName, i;
            sizeFontName = u->chatQueue[0] | (u->chatQueue[1] << 8);
-           char nameFont[sizeFontName + 1];
+           char* nameFont = new char[sizeFontName + 1];
            for (i = 0; i < sizeFontName; i++)
               nameFont[i] = u->chatQueue[i + 2];
@@ -1617 +1618 @@
            //the size includes the following character, so don't dequeue it
            chatSize--;
+           delete [] nameFont;
            break;
         }

trunk/licq/src/icqd-srv.cpp

@@ -3035 +3035 @@
       nMsgLen -= 4;
 
-      char* szMessage = new char[nMsgLen+1];
+        char* szMessage = new char[nMsgLen+1];
       for (int i = 0; i < nMsgLen; i++)
         szMessage[i] = msgTxt.UnpackChar();
@@ -3842 +3842 @@
     packet >> nAckFlags >> nMsgFlags >> nLen;
     
-    char szMessage[nLen + 1];
+    char* szMessage = new char[nLen + 1];
     for (unsigned short i = 0; i < nLen; i++)
       packet >> szMessage[i];
@@ -3886 +3886 @@
     }
     gUserManager.DropUser(u);
-    
+
+    delete [] szMessage;
+
     ICQEvent *e = DoneServerEvent(nMsgID, EVENT_ACKED);
     if (e)

trunk/licq/src/icqd-tcp.cpp

@@ -343 +343 @@
   gTranslator.ClientToServer(szDescDos);
   int n = strlen_safe(url) + strlen_safe(szDescDos) + 2;
-  char m[n];
+  char* m = new char[n];
   if (!online && n > MAX_MESSAGE_SIZE && szDescDos != NULL)
     szDescDos[MAX_MESSAGE_SIZE - strlen_safe(url) - 2] = '\0';
@@ -392 +392 @@
   if (szDescDos)
     delete [] szDescDos;
+
+  delete [] m;
 
   if (result != NULL)
@@ -1929 +1931 @@
   else
   {
-  
+
   // read in the message minus any stupid DOS \r's
-  char messageTmp[messageLen + 1];
+  char* messageTmp = new char[messageLen + 1];
   unsigned short j = 0;
   for (unsigned short i = 0; i < messageLen; i++)
@@ -1941 +1943 @@
 
   message = parseRTF(messageTmp);
+  delete [] messageTmp;
 
   if (nInVersion <= 4)
@@ -2318 +2321 @@
         packet >> junkLong
                >> nLenFilename;
-        char szFilename[nLenFilename+1];
+        char* szFilename = new char[nLenFilename+1];
         for (unsigned short i = 0; i < nLenFilename; i++)
            packet >> szFilename[i];
@@ -2351 +2354 @@
                                        filelist, theSequence, TIME_NOW,
                                        nMask | licqVersion);
+        delete [] szFilename;
         // Add the user to our list if they are new
         if (bNewUser)
@@ -2379 +2383 @@
                 packet >> nLongLen; // plugin name len
 
-                char szPlugin[nLongLen+1];
+                                char* szPlugin = new char[nLongLen+1];
                 for (unsigned long i = 0; i < nLongLen; i++)
                     packet >> szPlugin[i];
@@ -2400 +2404 @@
                 {
                     gLog.Info(tr("%sUnknown ICBM plugin type: %s\n"), L_TCPxSTR, szPlugin);
-                    break;
-                }
-
-                char szMessage[nLongLen+1];
+          delete [] szPlugin;
+      break;
+    }
+
+        char* szMessage = new char[nLongLen+1];
                 for (unsigned long i = 0; i < nLongLen; i++)
                     packet >> szMessage[i];
@@ -2416 +2421 @@
                     packet.incDataPosRead(2); // unknown
                     packet >> nLen; // filename len, including NULL
-                    char szFilename[nLen+1];
+            char* szFilename = new char[nLen+1];
                     for (unsigned short i = 0; i < nLen; i++)
                         packet >> szFilename[i];
@@ -2432 +2437 @@
                     gTranslator.ServerToClient(szMessage);
                     CEventFile *e = new CEventFile(szFilename, szMessage, nFileSize,
-                                                                                 filelist, theSequence, TIME_NOW, nMask);
+                filelist, theSequence, TIME_NOW, nMask);
+            delete [] szFilename;
+
                     if (bNewUser)
                     {
@@ -2544 +2551 @@
                 } // switch nICBMCommand
 
-                break;
-            }
+        delete [] szPlugin;
+        delete [] szMessage;
+
+    break;
+      }
 
       // Old-style encryption request:
@@ -2770 +2780 @@
                 packet >> nLongLen; // Plugin name len
 
-                char szPlugin[nLongLen+1];
+        char* szPlugin = new char[nLongLen+1];
                 for (unsigned long i = 0; i < nLongLen; i++)
                     packet >> szPlugin[i];
@@ -2792 +2802 @@
                                         szPlugin);
                     gUserManager.DropUser(u);
-                    return true;
-                }
-
-                packet >> nLongLen;
-                char szMessage[nLongLen+1];
+          delete [] szPlugin;
+      return true;
+    }
+
+    packet >> nLongLen;
+        char* szMessage = new char[nLongLen+1];
                 for (unsigned short i = 0; i < nLongLen; i++)
                     packet >> szMessage[i];
@@ -2841 +2852 @@
                 } // switch nICBMCommand
 
-                break;
-            }
+        delete [] szPlugin;
+        delete [] szMessage;
+
+    break;
+      }
 
 #ifdef USE_OPENSSL
@@ -3334 +3348 @@
               packet.incDataPosRead(4); //Unknown
               unsigned long nLen = packet.UnpackUnsignedLong();
-              char szName[nLen+1];
+              char* szName = new char[nLen+1];
               for (unsigned long i = 0; i < nLen; i++)
                 packet >> szName[i];
@@ -3340 +3354 @@
 
               nLen = packet.UnpackUnsignedLong();
-              char szFullName[nLen+1];
+              char* szFullName = new char[nLen+1];
               for (unsigned long i = 0; i < nLen; i++)
                 packet >> szFullName[i];
@@ -3349 +3363 @@
               gLog.Info("%s%s has %s (%s).\n", szInfo, u->GetAlias(), szName,
                                                szFullName);
+              delete [] szName;
+              delete [] szFullName;
             }
             break;
@@ -3356 +3372 @@
           {
             gLog.Info("%sPhone Book reply from %s.\n", szInfo, u->GetAlias());
-            struct PhoneBookEntry pb[nEntries];
+            PhoneBookEntry *pb = new PhoneBookEntry[nEntries];
             for (unsigned long i = 0; i < nEntries; i ++)
             {
@@ -3429 +3445 @@
             u->SetEnableSave(true);
             u->SavePhoneBookInfo();
+            delete [] pb;
 
             PushPluginSignal(new CICQSignal(SIGNAL_UPDATExUSER, USER_PHONExBOOK,
@@ -3455 +3472 @@
 
             unsigned long nLen = packet.UnpackUnsignedLong();
-            char data[nLen];
+            char* data = new char[nLen];
             for (unsigned long i = 0; i < nLen; i++)
             {
@@ -3462 +3479 @@
 
             write(nFD, data, nLen);
+            delete [] data;
 
             u->SetEnableSave(false);
@@ -3661 +3679 @@
             packet.incDataPosRead(4); //Unknown
             unsigned long nLen = packet.UnpackUnsignedLong();
-            char szName[nLen+1];
+            char* szName = new char[nLen+1];
             for (unsigned long i = 0; i < nLen; i++)
               packet >> szName[i];
@@ -3667 +3685 @@
 
             nLen = packet.UnpackUnsignedLong();
-            char szFullName[nLen+1];
+            char* szFullName = new char[nLen+1];
             for (unsigned long i = 0; i < nLen; i++)
               packet >> szFullName[i];
@@ -3676 +3694 @@
             gLog.Info("%s%s has %s (%s).\n", szInfo, u->GetAlias(), szName,
                                              szFullName);
+            delete [] szName;
+            delete [] szFullName;
           }
         }

trunk/licq/src/icqd.cpp

@@ -1043 +1043 @@
 
   size_t nLen = strlen(BASE_DIR) + sizeof(file) + sizeof(suffix) + 2;
-  char szTmpName[nLen], szFilename[nLen], buff[128];
+  char* szTmpName = new char[nLen];
+  char* szFilename = new char[nLen];
+  char buff[128];
   int nRet, n, fd;
  
@@ -1059 +1061 @@
       gLog.Error("%sFailed updating %s: `%s'\n", L_ERRORxSTR,
                  szFilename, strerror(errno));
+    delete [] szTmpName;
+    delete [] szFilename;
     return;
   }
@@ -1106 +1110 @@
     gLog.Error("%sFailed updating %s: `%s'\n", L_ERRORxSTR,
                szFilename, strerror(errno));
+
+  delete [] szTmpName;
+  delete [] szFilename;
 }
 
@@ -2506 +2513 @@
     if (!bIsAck)
     {
-      char szFilename[nFilenameLen+1];
+      char* szFilename = new char[nFilenameLen+1];
       for (unsigned short i = 0; i < nFilenameLen; i++)
         packet >> szFilename[i];
@@ -2519 +2526 @@
       nEventType = ON_EVENT_FILE;
       pEvent = e;
+
+      delete [] szFilename;
     }
     else
@@ -2614 +2623 @@
     packet.incDataPosRead(18);
     packet >> nLongLen; // plugin len
-    char szPlugin[nLongLen+1];
+      char* szPlugin = new char[nLongLen+1];
     for (unsigned long i = 0; i < nLongLen; i++)
       packet >> szPlugin[i];
@@ -2640 +2649 @@
 
     packet >> nLongLen;
-    char szMessage[nLongLen+1];
+      char* szMessage = new char[nLongLen+1];
     for (unsigned long i = 0; i < nLongLen; i++)
       packet >> szMessage[i];
@@ -2653 +2662 @@
     ProcessMessage(u, packet, msg, nCommand, nMask, nMsgID,
                    nSequence, bIsAck, bNewUser);
-    return;
-
-    break; // bah!
-  }
+      delete [] szPlugin;
+      delete [] szMessage;
+      return;
+
+      break; // bah!
+    }
 
   default:

trunk/licq/src/onevent.cpp

@@ -107 +107 @@
     if (strlen(szFullParam))
     {
-      char szCmd[strlen(m_szCommand) + strlen(szFullParam) + 8];
+      char* szCmd = new char[strlen(m_szCommand) + strlen(szFullParam) + 8];
       sprintf(szCmd, "%s %s &", m_szCommand, szFullParam);
       system(szCmd);
+      delete [] szCmd;
     }