Skip to content

Commit 6050baf

Browse files
committed
Fix NPE in collapse margin logic.
DEVSIX-1195
1 parent da5798b commit 6050baf

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

layout/src/main/java/com/itextpdf/layout/margincollapse/MarginsCollapseHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@ public void endMarginsCollapse(Rectangle layoutBox) {
243243
} else {
244244
ownCollapseAfter = new MarginsCollapse();
245245
}
246-
ownCollapseAfter.joinMargin(getModelBottomMargin(renderer));
246+
if (ownCollapseAfter != null) {
247+
ownCollapseAfter.joinMargin(getModelBottomMargin(renderer));
248+
}
247249
collapseInfo.setOwnCollapseAfter(ownCollapseAfter);
248250

249251
if (collapseInfo.isSelfCollapsing()) {
@@ -288,7 +290,7 @@ public void endMarginsCollapse(Rectangle layoutBox) {
288290
}
289291

290292
private void updateCollapseBeforeIfPrevKidIsFirstAndSelfCollapsed(MarginsCollapse collapseAfter) {
291-
if (prevChildMarginInfo.isSelfCollapsing() && prevChildMarginInfo.isIgnoreOwnMarginTop()) {
293+
if (prevChildMarginInfo.isSelfCollapsing() && prevChildMarginInfo.isIgnoreOwnMarginTop() && collapseAfter != null) {
292294
// prevChildMarginInfo.isIgnoreOwnMarginTop() is true only if it's the first kid and is adjoined to parent margin
293295
collapseInfo.getCollapseBefore().joinMargin(collapseAfter);
294296
}

0 commit comments

Comments
 (0)