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

pull/155/head
frosch 11 years ago
parent bcd6836291
commit 2f30fdc370

@ -319,7 +319,8 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width)
}
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++;
assert(iter != this->runs.End());
@ -365,7 +366,8 @@ ParagraphLayout::Line *ParagraphLayout::nextLine(int max_width)
}
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;
}

Loading…
Cancel
Save