sc/source/filter/xml/xmlcelli.cxx | 18 ++++++------ sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx | 1 writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr |binary writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr |binary 4 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit 3150ae30415c1253258829dd3d39c015e75c6171 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Nov 13 10:22:08 2014 +0000 valgrind: check return of convertDateTime before using fDate lots of spew in VALGRIND=memcheck make CppunitTest_writerperfect_calc Change-Id: I8b95e95218beefe19e881c9d055323d0abec49c7 diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 7c2c190..68fb1fe 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -935,14 +935,16 @@ void ScXMLTableRowCellContext::SetAnnotation(const ScAddress& rPos) if( pNote ) { double fDate; - rXMLImport.GetMM100UnitConverter().convertDateTime( fDate, mxAnnotationData->maCreateDate ); - SvNumberFormatter* pNumForm = pDoc->GetFormatTable(); - sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM ); - OUString aDate; - Color* pColor = 0; - Color** ppColor = &pColor; - pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor ); - pNote->SetDate( aDate ); + if (rXMLImport.GetMM100UnitConverter().convertDateTime(fDate, mxAnnotationData->maCreateDate)) + { + SvNumberFormatter* pNumForm = pDoc->GetFormatTable(); + sal_uInt32 nfIndex = pNumForm->GetFormatIndex( NF_DATE_SYS_DDMMYYYY, LANGUAGE_SYSTEM ); + OUString aDate; + Color* pColor = 0; + Color** ppColor = &pColor; + pNumForm->GetOutputString( fDate, nfIndex, aDate, ppColor ); + pNote->SetDate( aDate ); + } pNote->SetAuthor( mxAnnotationData->maAuthor ); } commit 78bc1be4a7f8b507eaddc6defe1cc3505edf2238 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Nov 13 09:35:34 2014 +0000 add CVE-2014-6352 testcase Change-Id: I4f1ad13f73737a2c88d5b911f9df858a3427eac2 diff --git a/sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx b/sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx new file mode 100644 index 0000000..f88506ff --- /dev/null +++ b/sd/qa/unit/data/pptx/fail/CVE-2014-6352-1.ppsx @@ -0,0 +1 @@ +ת.Gx©}Ø'[eë2Î~ \ No newline at end of file commit 58d5cbd978fdd7dd29e61e1aa99f8141581a6599 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Nov 13 09:20:56 2014 +0000 add EDB-35217 tests Change-Id: Id37702123bd81a7102d101d3348dcf923c20a5d8 diff --git a/writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr b/writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr new file mode 100644 index 0000000..3745033 Binary files /dev/null and b/writerperfect/qa/unit/data/draw/libcdr/fail/EDB-35217-1.cdr differ diff --git a/writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr b/writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr new file mode 100644 index 0000000..7a15b4b Binary files /dev/null and b/writerperfect/qa/unit/data/draw/libcdr/pass/EDB-35217-2.cdr differ
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits