Merge pull request #37 from KroArtem/master

Fix coverity issues (memleaks, copy-paste error)
This commit is contained in:
auriamg
2014-02-10 19:23:45 -05:00
6 changed files with 14 additions and 2 deletions

View File

@@ -181,6 +181,9 @@ void* NewsManager::downloadNews(void *obj)
xml = NULL;
} // hadDownloadError
if(xml) delete xml;
xml = NULL;
// Process new.xml now.
if(file_manager->fileExists(xml_file))
{

View File

@@ -85,6 +85,7 @@ Event::Event(const Event& event)
Event::~Event()
{
delete peer;
peer = NULL;
m_packet = NULL;
}

View File

@@ -40,6 +40,7 @@ GameSetup::~GameSetup()
delete m_players[i];
};
m_players.clear();
delete m_race_config;
}
//-----------------------------------------------------------------------------

View File

@@ -51,7 +51,13 @@ STKPeer::~STKPeer()
m_peer = NULL;
if (m_player_profile)
delete m_player_profile;
m_player_profile = NULL;
m_player_profile = NULL;
if (m_client_server_token)
delete m_client_server_token;
m_client_server_token = NULL;
if (m_token_set)
delete m_token_set;
m_token_set = NULL;
}
//-----------------------------------------------------------------------------

View File

@@ -270,7 +270,7 @@ namespace Online{
assert (profile != NULL);
if(!this->m_has_fetched_friends && profile->m_has_fetched_friends)
this->m_friends = profile->m_friends;
if(!this->m_has_fetched_achievements && profile->m_has_fetched_friends)
if(!this->m_has_fetched_achievements && profile->m_has_fetched_achievements)
this->m_achievements = profile->m_achievements;
if(this->m_relation_info == NULL && profile->m_relation_info != NULL)
{

View File

@@ -102,6 +102,7 @@ void TriangleMesh::createCollisionShape(bool create_collision_object, const char
FILE *f = fopen(serialized_bhv, "rb");
fseek(f, 0, SEEK_END);
long pos = ftell(f);
assert(pos != -1L);
fseek(f, 0, SEEK_SET);
void* bytes = btAlignedAlloc(pos, 16);