UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Poincare/layouts] Fixed a crash due to infinite loop

Browse Source 
Change-Id: Ieb6563dd978c5c363326163b983b40ed13dab913
This commit is contained in:
Arthur Camouseigt
2020-08-24 15:37:10 +02:00
committed by Émilie Feral
parent a6db9688cd
commit ae43ec0cc9
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
poincare/src/bracket_layout.cpp
View File

@@ -59,6 +59,14 @@ KDCoordinate BracketLayoutNode::computeBaseline() {
int currentNumberOfOpenBrackets = 1; int currentNumberOfOpenBrackets = 1;
KDCoordinate result = 0; KDCoordinate result = 0;
if (parentLayout->type() != LayoutNode::Type::HorizontalLayout) {
/* The bracket has no true sibling. Those that might be founded by
* numberOfSiblings = parentLayout->numberOfChildren() are likely children
* of Narylayout where the bracket is alone in one of the sublayouts. To
* prevent it from defining its height and baseline according to the other
* sublayouts, we use this escape case.*/
return result;
}
int increment = (type() == Type::LeftParenthesisLayout || type() == Type::LeftSquareBracketLayout) ? 1 : -1; int increment = (type() == Type::LeftParenthesisLayout || type() == Type::LeftSquareBracketLayout) ? 1 : -1;
for (int i = idxInParent + increment; i >= 0 && i < numberOfSiblings; i+=increment) { for (int i = idxInParent + increment; i >= 0 && i < numberOfSiblings; i+=increment) {
LayoutNode * sibling = parentLayout->childAtIndex(i); LayoutNode * sibling = parentLayout->childAtIndex(i);
@@ -101,6 +109,14 @@ KDCoordinate BracketLayoutNode::computeChildHeight() {
assert(parentLayout != nullptr); assert(parentLayout != nullptr);
KDCoordinate result = Metric::MinimalBracketAndParenthesisHeight; KDCoordinate result = Metric::MinimalBracketAndParenthesisHeight;
int idxInParent = parentLayout->indexOfChild(this); int idxInParent = parentLayout->indexOfChild(this);
if (parentLayout->type() != LayoutNode::Type::HorizontalLayout) {
/* The bracket has no true sibling. Those that might be founded by
* numberOfSiblings = parentLayout->numberOfChildren() are likely children
* of Narylayout where the bracket is alone in one of the sublayouts. To
* prevent it from defining its height and baseline according to the other
* sublayouts, we use this escape case.*/
return result;
}
int numberOfSiblings = parentLayout->numberOfChildren(); int numberOfSiblings = parentLayout->numberOfChildren();
if ((type() == Type::LeftParenthesisLayout || type() == Type::LeftSquareBracketLayout) if ((type() == Type::LeftParenthesisLayout || type() == Type::LeftSquareBracketLayout)
&& idxInParent < numberOfSiblings - 1 && idxInParent < numberOfSiblings - 1
@@ -111,7 +127,6 @@ KDCoordinate BracketLayoutNode::computeChildHeight() {
* needs the superscript height, which needs the bracket height. */ * needs the superscript height, which needs the bracket height. */
return result; return result;
} }
KDCoordinate maxUnderBaseline = 0; KDCoordinate maxUnderBaseline = 0;
KDCoordinate maxAboveBaseline = 0; KDCoordinate maxAboveBaseline = 0;