summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Bende <tushar.bende@synerzip.com>2014-06-04 15:04:18 +0530
committerCaolán McNamara <caolanm@redhat.com>2014-06-05 08:29:16 +0000
commit8fcd4bf323bc3390e366229d549641444b5a3e9a (patch)
tree34a054c6023b7ad4f619a5bebcce6fb64a21fce4
parentd595e5ec4e092344460f53d287b970c147913e99 (diff)
fdo#79535 :LO writer crash while Opening some document.
Problem Description : While setting ExtraData for Redline LO calls SwRangeRedline::SetExtraData() with argument of type SwRedlineExtraData_FormattingChanges* which contains SfxItemSet* In function SwRedlineExtraData_FormattingChanges() without Null checking SfxItemSet*, LO was trying to get rCpy.pSet->Count() which was the reason for segmentation fault while opening some documents in LO. Added Null check before accessing a pointer. Change-Id: I33299d2be2777ab6a8af0621595c9453145f1069 Reviewed-on: https://gerrit.libreoffice.org/9647 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/qa/extras/ooxmlimport/data/fdo79535.docxbin0 -> 22547 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx11
-rw-r--r--sw/source/core/doc/docredln.cxx3
3 files changed, 13 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo79535.docx b/sw/qa/extras/ooxmlimport/data/fdo79535.docx
new file mode 100644
index 000000000000..64aab18e0ad7
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/fdo79535.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 14aa543d7aab..f003f333680f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2153,6 +2153,17 @@ DECLARE_OOXMLIMPORT_TEST(testFdo78883, "fdo78883.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
}
+DECLARE_OOXMLIMPORT_TEST(testFdo79535, "fdo79535.docx")
+{
+ // fdo#79535 : LO was crashing while opening document
+ // Checking there is a single page after loading a doc successfully in LO.
+ uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
+ uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+ uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+ xCursor->jumpToLastPage();
+ CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
+}
+
DECLARE_OOXMLIMPORT_TEST(testBnc875718, "bnc875718.docx")
{
// The frame in the footer must not accidentally end up in the document body.
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 64887a11f1b5..cb1520a7af71 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3204,7 +3204,8 @@ SwRedlineExtraData_FormattingChanges::SwRedlineExtraData_FormattingChanges( cons
SwRedlineExtraData_FormattingChanges::SwRedlineExtraData_FormattingChanges( const SwRedlineExtraData_FormattingChanges& rCpy )
: SwRedlineExtraData()
{
- if( rCpy.pSet->Count() )
+ // Checking pointer pSet before accessing it for Count
+ if( rCpy.pSet && rCpy.pSet->Count() )
{
pSet = new SfxItemSet( *(rCpy.pSet) );
}