vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx | 2 +- vcl/source/bitmap/BitmapFilterStackBlur.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 67a661800e32bb371a0a23ba498915c4508772bd Author: Caolán McNamara <[email protected]> AuthorDate: Sun Jun 12 16:57:38 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Jun 13 06:54:11 2022 +0200 crashtesting: fix crash seen on loading forum-mso-de-98993.xlsx which may explain the backtraces seen with BitmapFilterStackBlur::filter and BitmapBasicMorphologyFilter::filter in crashreporting Change-Id: Ib55cde1603d354b8ca0e336a08fe2d73b548f73f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135680 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx index 5d3f1d2772e1..8516f5861a5d 100644 --- a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx +++ b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx @@ -342,7 +342,7 @@ Bitmap BitmapBasicMorphologyFilter::filter(Bitmap const& rBitmap) const ScanlineFormat nScanlineFormat; { Bitmap::ScopedReadAccess pReadAccess(bitmapCopy); - nScanlineFormat = pReadAccess->GetScanlineFormat(); + nScanlineFormat = pReadAccess ? pReadAccess->GetScanlineFormat() : ScanlineFormat::NONE; } switch (nScanlineFormat) diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx index be1ab84296c7..eeb5810f5d1f 100644 --- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx +++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx @@ -630,7 +630,7 @@ Bitmap BitmapFilterStackBlur::filter(Bitmap const& rBitmap) const ScanlineFormat nScanlineFormat; { Bitmap::ScopedReadAccess pReadAccess(bitmapCopy); - nScanlineFormat = pReadAccess->GetScanlineFormat(); + nScanlineFormat = pReadAccess ? pReadAccess->GetScanlineFormat() : ScanlineFormat::NONE; } if (nScanlineFormat == ScanlineFormat::N24BitTcRgb
