Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237171 - Improve a case where ICO and BMP files disagree on an image size. r=tn.

Browse Source 
--HG--
extra : rebase_source : 80701833249881c3022309f6237a3084b61b1881
This commit is contained in:
Nicholas Nethercote 2016-01-07 16:18:22 -08:00
parent e8feab9b63
commit 02921e7c85
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
image/decoders/nsBMPDecoder.cpp
View File

@ -710,6 +710,18 @@ nsBMPDecoder::ReadColorTable(const char* aData, size_t aLength)
LexerTransition<nsBMPDecoder::State>
nsBMPDecoder::SkipGap()
{
// If there are no pixels we can stop.
//
// XXX: normally, if there are no pixels we will have stopped decoding before
// now, outside of this decoder. However, if the BMP is within an ICO file,
// it's possible that the ICO claimed the image had a non-zero size while the
// BMP claims otherwise. This test is to catch that awkward case. If we ever
// come up with a more general solution to this ICO-and-BMP-disagree-on-size
// problem, this test can be removed.
if (mH.mWidth == 0 || mH.mHeight == 0) {
return Transition::TerminateSuccess();
}
bool hasRLE = mH.mCompression == Compression::RLE8 ||
mH.mCompression == Compression::RLE4;
return hasRLE
@ -720,6 +732,7 @@ nsBMPDecoder::SkipGap()
LexerTransition<nsBMPDecoder::State>
nsBMPDecoder::ReadPixelRow(const char* aData)
{
MOZ_ASSERT(mCurrentRow > 0);
MOZ_ASSERT(mCurrentPos == 0);
const uint8_t* src = reinterpret_cast<const uint8_t*>(aData);