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

Fix #7434: Incorrect use of vector iterator. (#7437)

pull/7429/head
PeterN 2019-03-29 17:42:32 +00:00 committed by GitHub
parent acb09eb9a8
commit 9244dad3f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network_content_gui.cpp
View File

@ -636,9 +636,8 @@ public:
uint y = r.top; uint y = r.top;
auto iter = this->content.begin() + this->vscroll->GetPosition(); auto iter = this->content.begin() + this->vscroll->GetPosition();
auto end = iter + this->vscroll->GetCapacity(); size_t last = this->vscroll->GetPosition() + this->vscroll->GetCapacity();
if (end > this->content.end()) auto end = (last < this->content.size()) ? this->content.begin() + last : this->content.end();
end = this->content.end();
for (/**/; iter != end; iter++) { for (/**/; iter != end; iter++) {
const ContentInfo *ci = *iter; const ContentInfo *ci = *iter;