external/skia/UnpackedTarball_skia.mk | 1 + external/skia/incomplete-type-SkImageGenerator.patch.1 | 11 +++++++++++ sc/source/ui/vba/vbainterior.cxx | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-)
New commits: commit 538d3e8d7ff08ea9287c4808b71ef4362cc54b98 Author: Noel Grandin <[email protected]> AuthorDate: Fri Jul 14 08:59:13 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Jul 14 13:52:37 2023 +0200 fix ubsan after commit e40f69419e86fb9d189032410686c5c06efbdbbb Author: Noel Grandin <[email protected]> Date: Mon Jul 10 18:33:52 2023 +0200 use more frozen ================================================================= ==27441==ERROR: AddressSanitizer: global-buffer-overflow on address 0x7feaccd42aa8 at pc 0x7feacc86a5e7 bp 0x7ffc3e6e9390 sp 0x7ffc3e6e9388 READ of size 4 at 0x7feaccd42aa8 thread T0 /sc/source/ui/vba/vbainterior.cxx:103:58 ScVbaInterior::setColor(com::sun::star::uno::Any const&) /sc/source/ui/vba/vbainterior.cxx:90:9 ScVbaInterior::setColorIndex(com::sun::star::uno::Any const&) /sc/source/ui/vba/vbainterior.cxx:150:9 Change-Id: Iee3667ae975caffdeb63149738daea5c1b8ae01f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154432 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 8172d4096407..2de1abb73654 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -100,7 +100,10 @@ ScVbaInterior::SetMixedColor() { m_nPattern = GetAttributeData( aPattern ); } - sal_Int32 nPattern = aPatternMap.find( m_nPattern )->second; + sal_Int32 nPattern = 0; + auto it = aPatternMap.find( m_nPattern ); + if (it != aPatternMap.end()) + nPattern = it->second; // pattern color uno::Any aPatternColor = GetUserDefinedAttributes( PATTERNCOLOR ); if( aPatternColor.hasValue() ) commit 64140e0e7f8a151f298568c9173364efca636a46 Author: Noel Grandin <[email protected]> AuthorDate: Thu Jul 13 13:23:34 2023 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Jul 14 13:52:24 2023 +0200 fix "incomplete type" type in skia build seen by ohallot on a Kubuntu system (gcc version 12.2.0 kubuntu 23.4) /usr/include/c++/12/bits/unique_ptr.h:396:17: required from ‘std::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = SkImageGenerator; _Dp = std::default_delete<SkImageGenerator>]’ /mnt/bigfast/git/lom/workdir/UnpackedTarball/skia/src/ports/SkImageGenerator_none.cpp:14:12: required from here /usr/include/c++/12/bits/unique_ptr.h:93:23: error: invalid application of ‘sizeof’ to incomplete type ‘SkImageGenerator’ 93 | static_assert(sizeof(_Tp)>0, | ^~~~~~~~~~~ Change-Id: I172bfd1aa063de2c283c7205637de58c47dc73fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154386 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index b93328463076..b931aefd8618 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -40,6 +40,7 @@ skia_patches := \ fix-SkDebugf-link-error.patch.1 \ incomplete.patch.0 \ ubsan-missing-typeinfo.patch.1 \ + incomplete-type-SkImageGenerator.patch.1 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/incomplete-type-SkImageGenerator.patch.1 b/external/skia/incomplete-type-SkImageGenerator.patch.1 new file mode 100644 index 000000000000..e22c62d05dcf --- /dev/null +++ b/external/skia/incomplete-type-SkImageGenerator.patch.1 @@ -0,0 +1,11 @@ +diff -ur skia.org/src/ports/SkImageGenerator_none.cpp skia/src/ports/SkImageGenerator_none.cpp +--- skia.org/src/ports/SkImageGenerator_none.cpp 2023-07-13 12:45:22.893718610 +0200 ++++ skia/src/ports/SkImageGenerator_none.cpp 2023-07-13 12:45:46.621816770 +0200 +@@ -6,6 +6,7 @@ + */ + + #include "include/core/SkData.h" ++#include "include/core/SkImageGenerator.h" + #include "src/image/SkImageGeneratorPriv.h" + + namespace SkImageGenerators {
