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

Bug 555791 – Natuilus Crashes when opening USB MP3 Player Contents

Browse Source 
2008-10-13  Matthias Clasen  <mclasen@redhat.com>

        Bug 555791 – Natuilus Crashes when opening USB MP3 Player Contents

        * io-tga.c (gdk_pixbuf__tga_stop_load): Don't segfault on
        short files.
        Problem reported by Pedro Villavicencio


svn path=/trunk/; revision=21643
This commit is contained in:
Matthias Clasen 2008-10-13 14:18:40 +00:00 committed by Matthias Clasen
parent aadcba2dc5
commit e74968f8ef
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,11 @@
2008-10-13 Matthias Clasen <mclasen@redhat.com>
Bug 555791 – Natuilus Crashes when opening USB MP3 Player Contents
* io-tga.c (gdk_pixbuf__tga_stop_load): Don't segfault on
short files.
Problem reported by Pedro Villavicencio
2008-10-01 Tor Lillqvist <tml@novell.com>
* io-icns.c: Don't #define _GNU_SOURCE on Windows as it confuses

8
gdk-pixbuf/io-tga.c
View File

@ -349,7 +349,7 @@ static gboolean fill_in_context(TGAContext *ctx, GError **err)
}
ctx->pbuf_bytes = ctx->pbuf->rowstride * ctx->pbuf->height;
if (ctx->hdr->flags & TGA_ORIGIN_UPPER || ctx->run_length_encoded)
if ((ctx->hdr->flags & TGA_ORIGIN_UPPER) || ctx->run_length_encoded)
ctx->pptr = ctx->pbuf->pixels;
else
ctx->pptr = ctx->pbuf->pixels + (ctx->pbuf->height - 1)*ctx->pbuf->rowstride;
@ -935,8 +935,10 @@ static gboolean gdk_pixbuf__tga_stop_load(gpointer data, GError **err)
TGAContext *ctx = (TGAContext *) data;
g_return_val_if_fail(ctx != NULL, FALSE);
if (!(ctx->hdr->flags & TGA_ORIGIN_UPPER) &&
ctx->run_length_encoded && ctx->pbuf) {
if (ctx->hdr &&
(ctx->hdr->flags & TGA_ORIGIN_UPPER) == 0 &&
ctx->run_length_encoded &&
ctx->pbuf) {
pixbuf_flip_vertically (ctx->pbuf);
if (ctx->ufunc)
(*ctx->ufunc) (ctx->pbuf, 0, 0,