Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 18:08:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1567418. Try to diagnose crash in png decoder. r=aosmond

Browse Source 
Call WriteRow from a different line number if we have an interlacing buffer. I think the compiler shouldn't be able to optimize these into the same code, and so we should be able to distinguish them.

Differential Revision: https://phabricator.services.mozilla.com/D44061

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Timothy Nikkel 2019-08-30 11:27:58 +00:00
parent 95146c9c2f
commit dc486dab60
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
image/decoders/nsPNGDecoder.cpp
View File

@ -823,19 +823,21 @@ void nsPNGDecoder::row_callback(png_structp png_ptr, png_bytep new_row,
// Note that |new_row| may be null here, indicating that this is an interlaced
// image and |row_callback| is being called for a row that hasn't changed.
MOZ_ASSERT_IF(!new_row, decoder->interlacebuf);
uint8_t* rowToWrite = new_row;
if (decoder->interlacebuf) {
uint32_t width = uint32_t(decoder->mFrameRect.Width());
// We'll output the deinterlaced version of the row.
rowToWrite = decoder->interlacebuf + (row_num * decoder->mChannels * width);
uint8_t* rowToWrite =
decoder->interlacebuf + (row_num * decoder->mChannels * width);
// Update the deinterlaced version of this row with the new data.
png_progressive_combine_row(png_ptr, rowToWrite, new_row);
}
decoder->WriteRow(rowToWrite);
decoder->WriteRow(rowToWrite);
} else {
decoder->WriteRow(new_row);
}
}
void nsPNGDecoder::WriteRow(uint8_t* aRow) {