Changeset 8273 in orxonox.OLD

Timestamp:

Jun 8, 2006, 4:59:51 PM (18 years ago)

Author:

rennerc

Message:

removed some memory leaks

Location:

branches/network/src/lib/network

Files:

• data_stream.cc (modified) (2 diffs)
• message_manager.cc (modified) (1 diff)
• network_game_manager.cc (modified) (1 diff)
• synchronizeable.cc (modified) (5 diffs)

branches/network/src/lib/network/data_stream.cc

@@ -53 +53 @@
 DataStream::~DataStream()
 {
-
+  delete [] this->upBuffer;
+  this->upBuffer = NULL;
+  delete [] this->downBuffer;
+  this->downBuffer = NULL;
 }
 
@@ -120 +123 @@
 int passUp(byte* data)
 {
-
+  return 0;
 }

branches/network/src/lib/network/message_manager.cc

@@ -47 +47 @@
       if ( it2->data )
       {
-        delete it2->data;
+        delete [] it2->data;
         it2->data = NULL;
       }

branches/network/src/lib/network/network_game_manager.cc

@@ -70 +70 @@
 NetworkGameManager::~NetworkGameManager()
 {
+  delete MessageManager::getInstance();
 }
 

branches/network/src/lib/network/synchronizeable.cc

@@ -72 +72 @@
   if ( this->isServer() && this->beSynchronized() && this->getUniqueID() > 0 )
     NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
+    
+  for ( SyncVarList::iterator it = syncVarList.begin(); it != syncVarList.end(); it++ )
+  {
+    delete *it;
+  }
+  syncVarList.clear();
+  
+  for ( UserStateHistory::iterator it = recvStates.begin(); it != recvStates.end(); it++ )
+  {
+    for ( StateHistory::iterator it2 = it->begin(); it2 != it->end(); it2++ )
+    {
+      delete [] (*it2)->data;
+      delete *it2;
+    }
+
+  }
+  
+  for ( UserStateHistory::iterator it = sentStates.begin(); it != sentStates.end(); it++ )
+  {
+    for ( StateHistory::iterator it2 = it->begin(); it2 != it->end(); it2++ )
+    {
+      delete [] (*it2)->data;
+      delete *it2;
+    }
+
+  }
 }
 
@@ -159 +185 @@
 
     stateFrom = initialEntry;
+    
+    sentStates[userId].push_back( stateFrom );
   }
   else
@@ -278 +306 @@
 
     stateFrom = initialEntry;
+    
+    recvStates[userId].push_back( stateFrom );
   }
   else
@@ -442 +472 @@
       if ( (*delIt)->data )
         delete [] (*delIt)->data;
+      delete *delIt;
       recvStates[userId].erase( delIt );
       
@@ -510 +541 @@
       if ( (*delIt)->data )
         delete [] (*delIt)->data;
+      delete *delIt;
       sentStates[userId].erase( delIt );