summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-08-28 10:18:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-08-30 13:44:43 +0200
commit5ad6a1194e0d3cc1317755431c686424b6942eb9 (patch)
treec2e35d85c2f4474d6cc550af79e02b2b98bbca30
parentofz: MemorySanitizer: use-of-uninitialized-value (diff)
downloadcore-5ad6a1194e0d3cc1317755431c686424b6942eb9.tar.gz
core-5ad6a1194e0d3cc1317755431c686424b6942eb9.zip
ofz: MemorySanitizer: use-of-uninitialized-value
Change-Id: Id3acc87a697a61bcf3794745846071bc99fc8d8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121190 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 90b7746029b8..6e9ba1aa8438 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -611,7 +611,7 @@ bool PSDReader::ImplReadBody()
if (mpFileHeader->nMode == PSD_CMYK && m_rPSD.good())
{
sal_uInt32 nBlack, nBlackMax = 0;
- std::unique_ptr<sal_uInt8[]> pBlack(new sal_uInt8[ mpFileHeader->nRows * mpFileHeader->nColumns ]);
+ std::vector<sal_uInt8> aBlack(mpFileHeader->nRows * mpFileHeader->nColumns, 0);
nY = 0;
while (nY < mpFileHeader->nRows && m_rPSD.good())
{
@@ -640,7 +640,7 @@ bool PSDReader::ImplReadBody()
nBlack = mpBitmap->GetPixel( nY, nX ).GetBlue() + nDat;
if ( nBlack > nBlackMax )
nBlackMax = nBlack;
- pBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
+ aBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
if ( ++nX == mpFileHeader->nColumns )
{
nX = 0;
@@ -667,7 +667,7 @@ bool PSDReader::ImplReadBody()
nBlack = mpBitmap->GetPixel( nY, nX ).GetBlue() + nDat;
if ( nBlack > nBlackMax )
nBlackMax = nBlack;
- pBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
+ aBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
if ( ++nX == mpFileHeader->nColumns )
{
nX = 0;
@@ -683,7 +683,7 @@ bool PSDReader::ImplReadBody()
{
for ( nX = 0; nX < mpFileHeader->nColumns; nX++ )
{
- sal_Int32 nDAT = pBlack[ nX + nY * mpFileHeader->nColumns ] * ( nBlackMax - 256 ) / 0x1ff;
+ sal_Int32 nDAT = aBlack[ nX + nY * mpFileHeader->nColumns ] * ( nBlackMax - 256 ) / 0x1ff;
aBitmapColor = mpBitmap->GetPixel( nY, nX );
sal_uInt8 cR = static_cast<sal_uInt8>(MinMax( aBitmapColor.GetRed() - nDAT, 0, 255L ));