lotuswordpro/source/filter/lwplayout.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit da78742e189966bd6e7f49390164132684928756 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Apr 11 10:50:33 2017 +0100 ofz: loop in lwp layout Change-Id: Ic0a6a3c77b82e001829d8d9d7163e1b2141d8a0c diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 7ea7e2d2f2a7..3c32355e776d 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1370,7 +1370,13 @@ rtl::Reference<LwpVirtualLayout> LwpMiddleLayout::GetWaterMarkLayout() { return xLay; } - xLay.set(dynamic_cast<LwpVirtualLayout*>(xLay->GetNext().obj().get())); + rtl::Reference<LwpVirtualLayout> xNext(dynamic_cast<LwpVirtualLayout*>(xLay->GetNext().obj().get())); + if (xNext == xLay) + { + SAL_WARN("lwp", "loop in layout"); + break; + } + xLay = xNext; } return rtl::Reference<LwpVirtualLayout>(); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits