From 27f1a444eb5761401fb2668ac4a41241dd9fac66 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 26 Mar 2018 08:57:09 +0100 Subject: forcepoint #29 detect illegal self series add Change-Id: I3bba0f942780c54951a3a810c05cc3b56ca18a5e Reviewed-on: https://gerrit.libreoffice.org/51862 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit a471620af5099c960e22b46fad6e6f92a5055dbd) --- sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls | Bin 0 -> 17920 bytes sc/source/filter/excel/xichart.cxx | 5 +++++ 2 files changed, 5 insertions(+) create mode 100755 sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls (limited to 'sc') diff --git a/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls b/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls new file mode 100755 index 000000000000..e5eafd262520 Binary files /dev/null and b/sc/qa/unit/data/xls/pass/forcepoint-selfseriesadd.xls differ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 1dcde34ff7ff..6358cfa53a43 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -1867,6 +1867,11 @@ void XclImpChSeries::SetDataLabel( const XclImpChTextRef& xLabel ) void XclImpChSeries::AddChildSeries( const XclImpChSeries& rSeries ) { OSL_ENSURE( !HasParentSeries(), "XclImpChSeries::AddChildSeries - not allowed for child series" ); + if (&rSeries == this) + { + SAL_WARN("sc.filter", "self add attempt"); + return; + } /* In Excel, trend lines and error bars are stored as own series. In Calc, these are properties of the parent series. This function adds the -- cgit