sw/source/filter/html/htmltab.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 7c406640970c7b881946f454e20293d43e3b65e0 Author: Caolán McNamara <[email protected]> Date: Thu Feb 8 09:53:07 2018 +0000 ofz#6102 Null-dereference Change-Id: Ie69b8ac7fd402a2f13dca9a81513adeb9cae1832 diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index fa9a8a6e9f87..9865974cd44e 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1602,7 +1602,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper, nTopRow, nStartCol, nBottomRow, nSplitCol); - if ( 1 != nBoxRowSpan ) + if (1 != nBoxRowSpan && pBox) pBox->setRowSpan( nBoxRowSpan ); bSplitted = true; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
