callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash

Browse Source 
svn path=/trunk/; revision=20367
This commit is contained in:
Matthias Clasen
2008-06-13 04:23:54 +00:00
parent 809bc59c58
commit 7c12a83e52
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,10 @@
2008-06-13 Matthias Clasen <mclasen@redhat.com>
Bug 531960 – crash in eog-image.c:1154: (priv->image != NULL)
* io-ico.c: Check headers more thorougly.
Patch by Felix Riemann
2008-06-03 Matthias Clasen <mclasen@redhat.com> 2008-06-03 Matthias Clasen <mclasen@redhat.com>
* === Released 2.13.2 === * === Released 2.13.2 ===

25
gdk-pixbuf/io-ico.c
View File

@ -199,10 +199,33 @@ static void DecodeHeader(guchar *Data, gint Bytes,
guchar *BIH; /* The DIB for the used icon */ guchar *BIH; /* The DIB for the used icon */
guchar *Ptr; guchar *Ptr;
gint I; gint I;
guint16 imgtype; /* 1 = icon, 2 = cursor */
/* Step 1: The ICO header */ /* Step 1: The ICO header */
State->cursor = ((Data[3] << 8) + Data[2] == 2) ? TRUE : FALSE; /* First word should be 0 according to specs */
if (((Data[1] << 8) + Data[0]) != 0) {
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
_("Invalid header in icon"));
return;
}
imgtype = (Data[3] << 8) + Data[2];
State->cursor = (imgtype == 2) ? TRUE : FALSE;
/* If it is not a cursor make sure it is actually an icon */
if (!State->cursor && imgtype != 1) {
g_set_error (error,
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
_("Invalid header in icon"));
return;
}
IconCount = (Data[5] << 8) + (Data[4]); IconCount = (Data[5] << 8) + (Data[4]);