sc/source/filter/excel/xipage.cxx | 4 ++++
vcl/source/gdi/dibtools.cxx | 8 +++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 2b032b4a40bc3dd89bcf48036f3a24958ea68e06
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 11 09:08:47 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 11 15:31:07 2019 +0200
ofz#18110 Timeout
Change-Id: I6fc40d7ae2f93e0168ccfc1fdf1b99cee0ae6ac7
Reviewed-on: https://gerrit.libreoffice.org/80640
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index d5f1a9a7f8f9..4728a43700d1 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -466,11 +466,9 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const &
rHeader, BitmapWriteA
{
nRunByte = nCountByte >> 1;
- for( sal_uLong i = 0; i < nRunByte; i++ )
+ for (sal_uLong i = 0; i < nRunByte && nX < nWidth; ++i)
{
- if( nX < nWidth )
- rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp >> 4, rPalette, bForceToMonoWhileReading));
-
+ rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp >> 4, rPalette, bForceToMonoWhileReading));
if( nX < nWidth )
rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp & 0x0f, rPalette, bForceToMonoWhileReading));
}
@@ -480,7 +478,7 @@ bool ImplDecodeRLE(sal_uInt8* pBuffer, DIBV5Header const &
rHeader, BitmapWriteA
}
else
{
- for( sal_uLong i = 0; ( i < nCountByte ) && ( nX < nWidth );
i++ )
+ for (sal_uLong i = 0; i < nCountByte && nX < nWidth; ++i)
rAcc.SetPixelOnData(pScanline, nX++,
SanitizePaletteIndex(cTmp, rPalette, bForceToMonoWhileReading));
}
}
commit 043cb0a95a2052150f4c66e3b7330c1a8835bd2c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Oct 11 10:12:58 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 11 15:30:54 2019 +0200
ofz#15997 Timeout
Change-Id: Ib7f4649bcaeb35a7eb756e35e1f9656fdc4d3df6
Reviewed-on: https://gerrit.libreoffice.org/80645
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/excel/xipage.cxx
b/sc/source/filter/excel/xipage.cxx
index 0864c167287e..e5a27f1a68d4 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -28,6 +28,7 @@
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/brushitem.hxx>
+#include <unotools/configmgr.hxx>
#include <document.hxx>
#include <stlsheet.hxx>
#include <attrib.hxx>
@@ -121,6 +122,9 @@ void XclImpPageSettings::ReadHeaderFooter( XclImpStream&
rStrm )
case EXC_ID_FOOTER: maData.maFooter = aString; break;
default: OSL_FAIL( "XclImpPageSettings::ReadHeaderFooter - unknown
record" );
}
+
+ if (maData.maHeader.getLength() > 10 && utl::ConfigManager::IsFuzzing())
+ maData.maHeader = maData.maHeader.copy(0, 10);
}
void XclImpPageSettings::ReadPageBreaks( XclImpStream& rStrm )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
