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

(svn r25551) -Fix (r25465): Possible reading of uninitialised memory due to undefined execution order.

release/1.4
frosch 2013-07-01 19:53:05 +00:00
parent d9065fbfbe
commit e8b6d2b32d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gfx_layout.cpp
View File

@ -319,7 +319,8 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width)
} }
if (this->buffer == next_run) { if (this->buffer == next_run) {
*l->Append() = new VisualRun(iter->second, begin, this->buffer - begin, l->getWidth()); int w = l->getWidth();
*l->Append() = new VisualRun(iter->second, begin, this->buffer - begin, w);
iter++; iter++;
assert(iter != this->runs.End()); assert(iter != this->runs.End());
@ -365,7 +366,8 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width)
} }
if (l->Length() == 0 || last_char - begin != 0) { if (l->Length() == 0 || last_char - begin != 0) {
*l->Append() = new VisualRun(iter->second, begin, last_char - begin, l->getWidth()); int w = l->getWidth();
*l->Append() = new VisualRun(iter->second, begin, last_char - begin, w);
} }
return l; return l;
} }