diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-14 14:50:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-14 21:20:09 +0100 |
| commit | 625c53a428180092e343e45da8bb1242c8903314 (patch) | |
| tree | fcad0a50936b809eca4e9b5275401068bfe14dd4 /filter | |
| parent | b8bb1c259d2c2f493b5cb05dbe234472c0e41ddc (diff) | |
ofz#6326 Null-dereference
Change-Id: I97a8a06acc782dc6fb0baddf46332b18d19fecc4
Reviewed-on: https://gerrit.libreoffice.org/49736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/ipsd/ipsd.cxx | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index e254b1946be0..9a658ed13a40 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -117,6 +117,13 @@ bool PSDReader::ReadPSD(Graphic & rGraphic ) mvPalette[i] = Color( mpPalette[ i ], mpPalette[ i + 256 ], mpPalette[ i + 512 ] ); } } + + if ((mnDestBitDepth == 1 || mnDestBitDepth == 8) && mvPalette.empty()) + { + mbStatus = false; + return mbStatus; + } + // read bitmap data if ( mbStatus && ImplReadBody() ) { @@ -301,6 +308,22 @@ bool PSDReader::ImplReadHeader() return true; } +namespace +{ + const Color& SanitizePaletteIndex(std::vector<Color> const & rvPalette, sal_uInt8 nIndex) + { + if (nIndex >= rvPalette.size()) + { + auto nSanitizedIndex = nIndex % rvPalette.size(); + SAL_WARN_IF(nIndex != nSanitizedIndex, "filter.tga", "invalid colormap index: " + << static_cast<unsigned int>(nIndex) << ", colormap len is: " + << rvPalette.size()); + nIndex = nSanitizedIndex; + } + return rvPalette[nIndex]; + } +} + bool PSDReader::ImplReadBody() { sal_uLong nX, nY; @@ -336,7 +359,7 @@ bool PSDReader::ImplReadBody() nDat ^= 0xff; nBitCount = 7; } - mpBitmap->SetPixel( nY, nX, mvPalette[nDat >> nBitCount--] ); + mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat >> nBitCount--)); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; @@ -358,7 +381,7 @@ bool PSDReader::ImplReadBody() nDat ^= 0xff; nBitCount = 7; } - mpBitmap->SetPixel( nY, nX, mvPalette[nDat >> nBitCount--] ); + mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat >> nBitCount--)); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; @@ -392,7 +415,7 @@ bool PSDReader::ImplReadBody() const sal_uInt16 nCount = -nRunCount + 1; for (sal_uInt16 i = 0; i < nCount && m_rPSD.good(); ++i) { - mpBitmap->SetPixel( nY, nX, mvPalette[nDat] ); + mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat)); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; @@ -410,7 +433,7 @@ bool PSDReader::ImplReadBody() m_rPSD.ReadUChar( nDat ); if ( mpFileHeader->nDepth == 16 ) // 16 bit depth is to be skipped m_rPSD.ReadUChar( nDummy ); - mpBitmap->SetPixel( nY, nX, mvPalette[nDat] ); + mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat)); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; @@ -688,7 +711,7 @@ bool PSDReader::ImplReadBody() m_rPSD.ReadUChar( nDummy ); for ( sal_uInt16 i = 0; i < ( -nRunCount + 1 ); i++ ) { - mpBitmap->SetPixel( nY, nX, mvPalette[nDat] ); + mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat)); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; @@ -709,7 +732,7 @@ bool PSDReader::ImplReadBody() nDat = 1; if ( mpFileHeader->nDepth == 16 ) // 16 bit depth is to be skipped m_rPSD.ReadUChar( nDummy ); - mpBitmap->SetPixel( nY, nX, mvPalette[nDat] ); + mpBitmap->SetPixel(nY, nX, SanitizePaletteIndex(mvPalette, nDat)); if ( ++nX == mpFileHeader->nColumns ) { nX = 0; |