sw/source/filter/ww8/rtfattributeoutput.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f0a520421247de3345e2039ed6bc0e642aa52a8e
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri May 11 16:03:13 2012 +0200
RtfAttributeOutput::EndTableCell: fix integer underflow
Regression from commit 1f77a5e, caused an ~infinite loop with the bugdoc
from fdo#45522. With this fix, the bugdoc "just" crashes again.
Change-Id: Idb0282d1606351498c9148343b9578d2b3642acf
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index b3da716..e5ebc52 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -960,7 +960,8 @@ void RtfAttributeOutput::EndTableCell( )
m_bTableCellOpen = false;
m_bTblAfterCell = true;
m_bWroteCellInfo = false;
- m_aCells[m_nTableDepth]--;
+ if (m_aCells[m_nTableDepth] > 0)
+ m_aCells[m_nTableDepth]--;
}
void RtfAttributeOutput::EndTableRow( )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
