From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Psu97-0001yR-VW for garchives@archives.gentoo.org; Fri, 25 Feb 2011 09:39:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31BB01C002; Fri, 25 Feb 2011 09:39:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DD01E1C002 for ; Fri, 25 Feb 2011 09:39:25 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C0651B402E for ; Fri, 25 Feb 2011 09:39:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 568788006A for ; Fri, 25 Feb 2011 09:39:24 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <3427a8fed450601d6edfce892c2de44166770c0a.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch x11-libs/gtk+/gtk+-3.0.1-r1.ebuild x11-libs/gtk+/gtk+-3.0.1.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 3427a8fed450601d6edfce892c2de44166770c0a Date: Fri, 25 Feb 2011 09:39:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3fafd5741f86119069659a801f738e0f commit: 3427a8fed450601d6edfce892c2de44166770c0a Author: Priit Laes plaes org> AuthorDate: Fri Feb 25 09:34:38 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Fri Feb 25 09:34:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3427a8fe x11-libs/gtk+: Revbump to fix double free error in some applications --- x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch | 24 ++++++++++++++= ++++++ .../{gtk+-3.0.1.ebuild =3D> gtk+-3.0.1-r1.ebuild} | 2 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch b/x11-libs/= gtk+/files/gtk+-3.0.1-double-free.patch new file mode 100644 index 0000000..31c30d4 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch @@ -0,0 +1,24 @@ +From 651410fa2a2c9c1e390ecbe384ea259f9bd319c8 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Thu, 24 Feb 2011 16:38:40 +0000 +Subject: Copy event axes for double/triple click events in gdk_event_cop= y() + +Button event axes for double/triple click events are freed by +gdk_event_free(), so copy them to avoid an invalid free when releasing a +copied event. +--- +diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c +index 5188e1e..25853da 100644 +--- a/gdk/gdkevents.c ++++ b/gdk/gdkevents.c +@@ -555,6 +555,8 @@ gdk_event_copy (const GdkEvent *event) + break; +=20 + case GDK_BUTTON_PRESS: ++ case GDK_2BUTTON_PRESS: ++ case GDK_3BUTTON_PRESS: + case GDK_BUTTON_RELEASE: + if (event->button.axes) + new_event->button.axes =3D g_memdup (event->button.axes, +-- +cgit v0.8.3.4 diff --git a/x11-libs/gtk+/gtk+-3.0.1.ebuild b/x11-libs/gtk+/gtk+-3.0.1-r= 1.ebuild similarity index 99% rename from x11-libs/gtk+/gtk+-3.0.1.ebuild rename to x11-libs/gtk+/gtk+-3.0.1-r1.ebuild index 55473c2..17e0249 100644 --- a/x11-libs/gtk+/gtk+-3.0.1.ebuild +++ b/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild @@ -91,6 +91,8 @@ src_prepare() { replace-flags -O3 -O2 strip-flags =20 + epatch "${FILESDIR}/${P}-double-free.patch" + # Non-working test in gentoo's env sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ -i gtk/tests/testing.c || die "sed 1 failed"