rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed NULL dereference.

This commit is contained in:
crs 2002-05-22 16:42:48 +00:00
parent 4968a5bb7c
commit 0cbd6b07a2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client/CClient.cpp
View File

@ -44,7 +44,7 @@ CClient::~CClient()
void CClient::run(const CNetworkAddress& serverAddress) void CClient::run(const CNetworkAddress& serverAddress)
{ {
CThread* thread; CThread* thread = NULL;
try { try {
log((CLOG_NOTE "starting client")); log((CLOG_NOTE "starting client"));
@ -70,18 +70,22 @@ void CClient::run(const CNetworkAddress& serverAddress)
log((CLOG_ERR "client error: %s", e.what())); log((CLOG_ERR "client error: %s", e.what()));
// clean up // clean up
thread->cancel(); if (thread != NULL) {
thread->wait(); thread->cancel();
delete thread; thread->wait();
delete thread;
}
closeSecondaryScreen(); closeSecondaryScreen();
} }
catch (...) { catch (...) {
log((CLOG_DEBUG "unknown client error")); log((CLOG_DEBUG "unknown client error"));
// clean up // clean up
thread->cancel(); if (thread != NULL) {
thread->wait(); thread->cancel();
delete thread; thread->wait();
delete thread;
}
closeSecondaryScreen(); closeSecondaryScreen();
throw; throw;
} }