AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix infinite loop that can occur for bad image data (#150601, Chris Evans,

Browse Source 
Fri Aug 20 11:59:10 2004  Owen Taylor  <otaylor@redhat.com>

        * io-bmp.c: Fix infinite loop that can occur for bad
        image data (#150601, Chris Evans, Manish Singh)
This commit is contained in:
Owen Taylor 2004-08-20 17:59:24 +00:00 committed by Owen Taylor
parent a1f93eb16c
commit ed60d5f28c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,8 @@
Fri Aug 20 11:59:10 2004 Owen Taylor <otaylor@redhat.com>
* io-bmp.c: Fix infinite loop that can occur for bad
image data (#150601, Chris Evans, Manish Singh)
2004-08-17 Matthias Clasen <mclasen@redhat.com>
* abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS any more.

12
gdk-pixbuf/io-bmp.c
View File

@ -876,8 +876,18 @@ DoCompressed(struct bmp_progressive_state *context, GError **error)
guchar c;
gint idx;
if (context->compr.y >= context->Header.height)
/* context->compr.y might be past the last line because we are
* on padding past the end of a valid data, or we might have hit
* out-of-bounds data. Either way we just eat-and-ignore the
* rest of the file. Doing the check only here and not when
* we change y below is fine since BufferSize is always 2 here
* and the BMP file format always starts new data on 16-bit
* boundaries.
*/
if (context->compr.y >= context->Header.height) {
context->BufferDone = 0;
return TRUE;
}
y = context->compr.y;