diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-06-12 16:57:38 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-06-13 17:21:08 +0200 |
| commit | e0b98f2446eca90773c83831287e1037fa5e4a57 (patch) | |
| tree | 08c6501b2ca57f996ffd9ca375abcc4e890dbaa4 /vcl/source | |
| parent | 50ee953b0edc571ac9518c3e1be9242b78df0554 (diff) | |
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/+/135695
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/bitmap/BitmapFilterStackBlur.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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 |