svx/source/customshapes/EnhancedCustomShape3d.cxx | 6 ++++--
vcl/source/filter/itiff/itiff.cxx | 19 ++++++++++++-------
2 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit f37395de7177b7724c7b7d03e5b52e8da90c44d2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jul 20 09:18:12 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jul 20 18:05:19 2022 +0200
ofz#48366 Timeout
Change-Id: Id643e80696843e0c22ae7eee2b5862320948ae27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137249
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/filter/itiff/itiff.cxx
b/vcl/source/filter/itiff/itiff.cxx
index c607930e6007..3d21a66dc0af 100644
--- a/vcl/source/filter/itiff/itiff.cxx
+++ b/vcl/source/filter/itiff/itiff.cxx
@@ -125,6 +125,8 @@ bool ImportTiffGraphicImport(SvStream& rTIFF, Graphic&
rGraphic)
Animation aAnimation;
+ const bool bFuzzing = utl::ConfigManager::IsFuzzing();
+
do
{
uint32_t w, h;
@@ -157,7 +159,7 @@ bool ImportTiffGraphicImport(SvStream& rTIFF, Graphic&
rGraphic)
break;
}
- if (utl::ConfigManager::IsFuzzing())
+ if (bFuzzing)
{
const uint64_t MAX_SIZE = 200000000;
if (TIFFTileSize64(tif) > MAX_SIZE || nPixelsRequired > MAX_SIZE)
@@ -234,13 +236,16 @@ bool ImportTiffGraphicImport(SvStream& rTIFF, Graphic&
rGraphic)
BitmapEx aBitmapEx(bitmap, bitmapAlpha);
- switch (nOrientation)
+ if (!bFuzzing)
{
- case ORIENTATION_LEFTBOT:
- aBitmapEx.Rotate(2700_deg10, COL_BLACK);
- break;
- default:
- break;
+ switch (nOrientation)
+ {
+ case ORIENTATION_LEFTBOT:
+ aBitmapEx.Rotate(2700_deg10, COL_BLACK);
+ break;
+ default:
+ break;
+ }
}
AnimationBitmap aAnimationBitmap(aBitmapEx, Point(0, 0),
aBitmapEx.GetSizePixel(),
commit 779fc912b21102b6aed4109dc6b5d3f5937d2b4d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jul 20 11:11:16 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Jul 20 18:05:03 2022 +0200
ofz#49200 Timeout
disable slow path for fuzzing
Change-Id: Ic23d7ba56210915b53b4330edb44458a672ba4ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137255
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx
b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 731f8208d2f6..04d685c62122 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeMetalType.hpp>
#include <com/sun/star/drawing/ProjectionMode.hpp>
+#include <basegfx/color/bcolor.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b3dpolygon.hxx>
#include <basegfx/range/b2drange.hxx>
@@ -56,7 +57,7 @@
#include <svx/xlnwtit.hxx>
#include <svx/xlntrit.hxx>
#include <svx/xfltrit.hxx>
-#include <basegfx/color/bcolor.hxx>
+#include <unotools/configmgr.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -350,6 +351,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject(
basegfx::B2DPolyPolygon aTotalPolyPoly;
SdrObjListIter aIter( *pShape2d, SdrIterMode::DeepNoGroups );
const bool bMultipleSubObjects(aIter.Count() > 1);
+ const bool bFuzzing(utl::ConfigManager::IsFuzzing());
while( aIter.IsMore() )
{
@@ -394,7 +396,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject(
}
}
- if(bNeedToConvertToContour)
+ if (bNeedToConvertToContour && !bFuzzing)
{
SdrObject* pNewObj =
pNext->ConvertToContourObj(const_cast< SdrObject* >(pNext));
SdrPathObj* pNewPathObj = dynamic_cast< SdrPathObj*
>(pNewObj);
