From 95efeafc86f47592b37c44f2f7314324cc04250d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 2 Sep 2005 11:50:01 +0000
Subject: Add gtk+, avahi, dbus-0.34 (.36 coming soon) and dependencies. Fix
 x11-common breakage.

git-svn-id: https://svn.o-hand.com/repos/poky@13 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/gtk+/gtk+-2.6.4-1.osso7/002_xpmico.patch  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/002_xpmico.patch

(limited to 'openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/002_xpmico.patch')

diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/002_xpmico.patch b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/002_xpmico.patch
new file mode 100644
index 000000000..21500db65
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/002_xpmico.patch
@@ -0,0 +1,18 @@
+diff -Nur gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c gtk+-2.4.9/gdk-pixbuf/io-ico.c
+--- gtk+-2.4.9.orig/gdk-pixbuf/io-ico.c	2004-08-25 18:52:18.000000000 +0200
++++ gtk+-2.4.9/gdk-pixbuf/io-ico.c	2004-09-15 00:40:17.000000000 +0200
+@@ -210,6 +210,14 @@
+ 	
+  	State->HeaderSize = 6 + IconCount*16;
+ 
++	if (State->HeaderSize < 0) {
++		g_set_error (error,
++			     GDK_PIXBUF_ERROR,
++			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
++			     _("Invalid header in icon"));
++		return;
++	}
++
+  	if (State->HeaderSize>State->BytesInHeaderBuf) {
+  		guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
+ 		if (!tmp) {
-- 
cgit v1.2.3