mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15195) -Fix: don't crash when removing from something you're iterating over

release/0.7
rubidium 2009-01-21 12:23:08 +00:00
parent 727ffeedc9
commit 4bf2326bd1
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/network/network_content.cpp
View File

@ -750,29 +750,37 @@ void ClientNetworkContentSocketHandler::CheckDependencyState(ContentInfo *ci)
void ClientNetworkContentSocketHandler::OnConnect(bool success) void ClientNetworkContentSocketHandler::OnConnect(bool success)
{ {
for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); iter++) { for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); /* nothing */) {
(*iter)->OnConnect(success); ContentCallback *cb = *iter;
cb->OnConnect(success);
if (*iter != cb) iter++;
} }
} }
void ClientNetworkContentSocketHandler::OnDisconnect() void ClientNetworkContentSocketHandler::OnDisconnect()
{ {
for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); iter++) { for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); /* nothing */) {
(*iter)->OnDisconnect(); ContentCallback *cb = *iter;
cb->OnDisconnect();
if (*iter != cb) iter++;
} }
} }
void ClientNetworkContentSocketHandler::OnReceiveContentInfo(const ContentInfo *ci) void ClientNetworkContentSocketHandler::OnReceiveContentInfo(const ContentInfo *ci)
{ {
for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); iter++) { for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); /* nothing */) {
(*iter)->OnReceiveContentInfo(ci); ContentCallback *cb = *iter;
cb->OnReceiveContentInfo(ci);
if (*iter != cb) iter++;
} }
} }
void ClientNetworkContentSocketHandler::OnDownloadProgress(const ContentInfo *ci, uint bytes) void ClientNetworkContentSocketHandler::OnDownloadProgress(const ContentInfo *ci, uint bytes)
{ {
for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); iter++) { for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); /* nothing */) {
(*iter)->OnDownloadProgress(ci, bytes); ContentCallback *cb = *iter;
cb->OnDownloadProgress(ci, bytes);
if (*iter != cb) iter++;
} }
} }
@ -783,8 +791,10 @@ void ClientNetworkContentSocketHandler::OnDownloadComplete(ContentID cid)
ci->state = ContentInfo::ALREADY_HERE; ci->state = ContentInfo::ALREADY_HERE;
} }
for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); iter++) { for (ContentCallback **iter = this->callbacks.Begin(); iter != this->callbacks.End(); /* nothing */) {
(*iter)->OnDownloadComplete(cid); ContentCallback *cb = *iter;
cb->OnDownloadComplete(cid);
if (*iter != cb) iter++;
} }
} }