[Orxonox-commit 1101] r5822 - in code/branches/core5/src/libraries/network: . packet

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-09-28 17:05:28 +0200 (Mon, 28 Sep 2009)
New Revision: 5822

Modified:
   code/branches/core5/src/libraries/network/Server.cc
   code/branches/core5/src/libraries/network/packet/Gamestate.cc
Log:
fixed 2 leaks (one of them only in debug mode)


Modified: code/branches/core5/src/libraries/network/Server.cc
===================================================================
--- code/branches/core5/src/libraries/network/Server.cc	2009-09-28 13:56:30 UTC (rev 5821)
+++ code/branches/core5/src/libraries/network/Server.cc	2009-09-28 15:05:28 UTC (rev 5822)
@@ -244,7 +244,10 @@
       return true;
     packet::DeleteObjects *del = new packet::DeleteObjects();
     if(!del->fetchIDs())
+    {
+      delete del;
       return true;  //everything ok (no deletes this tick)
+    }
 //     COUT(3) << "sending DeleteObjects" << std::endl;
     while(temp != NULL){
       if( !(temp->getSynched()) ){

Modified: code/branches/core5/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/core5/src/libraries/network/packet/Gamestate.cc	2009-09-28 13:56:30 UTC (rev 5821)
+++ code/branches/core5/src/libraries/network/packet/Gamestate.cc	2009-09-28 15:05:28 UTC (rev 5822)
@@ -377,6 +377,7 @@
   uint8_t *dest2 = new uint8_t[dest_length];
   rawDiff( dest2, dest, basep, header_->getDataSize(), base->header_->getDataSize() );
   assert( memcmp( dest2, gs, dest_length) == 0 );
+  delete dest2;
 #endif
 
   Gamestate *g = new Gamestate(ndata, getClientID());