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

Bug 161896 after page finished loading browser crashes [@ gif_clear_screen]

Browse Source 
patch by paper@animecity.nu r=biesi sr=tor
This commit is contained in:
timeless%mac.com 2002-09-02 23:52:09 +00:00
parent 7bf4681be4
commit 735d218a27
2 changed files with 6 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
modules/libpr0n/decoders/gif/GIF2.cpp
View File

@ -625,108 +625,6 @@ gif_write_ready(const gif_struct* gs)
return PR_FALSE; /* No more data yet expires */
}
//******************************************************************************
/*
* For the first images in the sequence clear the logical
* screen to the background color, unless the first image
* completely covers the logical screen, in which case
* it's unnecessary. XXX - This can be optimized.
*/
static PRStatus
gif_clear_screen(gif_struct *gs)
{
PRUintn erase_width=0, erase_height=0, erase_x_offset=0, erase_y_offset=0;
PRBool erase;
erase = PR_FALSE;
if (gs->images_decoded == 0)
{
if ((gs->width != gs->screen_width) ||
(gs->height != gs->screen_height) ||
gs->is_transparent)
{
erase = PR_TRUE;
erase_width = gs->screen_width;
erase_height = gs->screen_height;
erase_x_offset = erase_y_offset = 0;
}
}
else
{
if (gs->last_disposal_method == DISPOSE_OVERWRITE_BGCOLOR)
{
erase = PR_TRUE;
erase_width = gs->last_width;
erase_height = gs->last_height;
erase_x_offset = gs->last_x_offset;
erase_y_offset = gs->last_y_offset;
}
}
gs->last_disposal_method = gs->disposal_method;
gs->last_width = gs->width;
gs->last_height = gs->height;
gs->last_x_offset = gs->x_offset;
gs->last_y_offset = gs->y_offset;
if (erase)
{
PRUintn i;
int src_trans_pixel_index;
PRUint8 *rowbuf = gs->rowbuf;
//GIF_IRGB *saved_src_trans_pixel, *saved_img_trans_pixel;
/* Catch images that fall outside the logical screen. */
if ((erase_x_offset + erase_width) > gs->screen_width)
erase_width = gs->screen_width - erase_x_offset;
/* We have to temporarily pretend the image is transparent
so we can clear using the context's background color. */
//saved_img_trans_pixel = ic->image->header.transparent_pixel;
//saved_src_trans_pixel = src_header->transparent_pixel;
//src_header->transparent_pixel = NULL;
//ic->image->header.transparent_pixel = NULL;
/* Pick an index for the source image's temporary transparent pixel.
The actual choice is immaterial since it will only be used for
the clear screen operation. */
GIF_IRGB * saved_gs_trans_pixel = gs->transparent_pixel;
gs->transparent_pixel = NULL;
src_trans_pixel_index = 0;
if (!gif_init_transparency(gs, src_trans_pixel_index)) {
gs->transparent_pixel = saved_gs_trans_pixel;
return PR_FAILURE; // out of mem
}
/* Now fill in the row buffer. */
for (i = 0; i < erase_width; i++)
rowbuf[i] = src_trans_pixel_index;
/* Note: We deliberately lie about the interlace
pass number so that calls to il_flush_image_data()
are done using a timer. */
// XXX pav this code doesn't actually get called does it ?
if (erase_width > 0) {
// XXX: make fake row callback to draw into the
//if (gs->ic->imgdcb)
// gs->ic->imgdcb->ImgDCBHaveRow(gs->rowbuf, gs->rgbrow,
// erase_x_offset, erase_width,
// erase_y_offset,erase_height, ilErase, 2);
/* Reset the source image's transparent pixel to its former state. */
gif_destroy_transparency(gs);
//src_header->transparent_pixel = saved_src_trans_pixel;
gs->transparent_pixel = saved_gs_trans_pixel;
}
}
return PR_SUCCESS;
}
/******************************************************************************/
/*
* process data arriving from the stream for the gif decoder
@ -783,10 +681,6 @@ PRStatus gif_write(gif_struct *gs, const PRUint8 *buf, PRUint32 len)
//}
}
PRStatus status = gif_clear_screen(gs);
if (status != PR_SUCCESS)
return PR_FAILURE;
/* Initialize LZW parser/decoder */
gs->datasize = *q;
if (gs->datasize > MAX_LZW_BITS)

6
modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
View File

@ -352,6 +352,12 @@ int EndImageFrame(
{
nsGIFDecoder2* decoder = NS_STATIC_CAST(nsGIFDecoder2*, aClientData);
// If mImageFrame hasn't been initialized, call HaveDecodedRow to init it
// One reason why it may not be initialized is because the frame
// is out of the bounds of the image.
if (!decoder->mImageFrame)
HaveDecodedRow(aClientData,nsnull,0,0,0,0,0,0);
// We actually have the timeout information before we get the lzw encoded image
// data, at least according to the spec, but we delay in setting the timeout for
// the image until here to help ensure that we have the whole image frame decoded before