diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-04 19:55:04 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-10-04 19:57:38 +0200 |
| commit | e1dee0aaacd8e30e2949053ebf351d76bad14ac3 (patch) | |
| tree | 60df4a104b15a1c76f1fb17d2458382f3494791e | |
| parent | 31713fee3c117007dbd322cbfc2971e52899d04c (diff) | |
limit degree for b-spline to 15 to prevent std::bad_alloc, fdo#46100
Change-Id: Ib801c6af84b52ed093be2ba5eba902513bfa4070
| -rw-r--r-- | chart2/source/view/charttypes/Splines.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 7129d4450837..8cb7fcb2d7aa 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -24,6 +24,8 @@ #include <algorithm> #include <functional> +#define MAX_BSPLINE_DEGREE 15 + //............................................................................. namespace chart { @@ -691,7 +693,9 @@ void SplineCalculater::CalculateBSplines( // ODF1.2 spec variable p OSL_ASSERT( nResolution > 1 ); OSL_ASSERT( nDegree >= 1 ); - sal_uInt32 p = nDegree; + + // limit the b-spline degree to prevent insanely large sets of points + sal_uInt32 p = std::min<sal_uInt32>(nDegree, MAX_BSPLINE_DEGREE); rResult.SequenceX.realloc(0); rResult.SequenceY.realloc(0); |