Fix use after free in DestroyAllIM (causing segmentation fault in app-text/gv exit) wrt #406487 by Matt Turner

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 88 insertions, 9 deletions

diff --git a/x11-libs/libXaw3d/ChangeLog b/x11-libs/libXaw3d/ChangeLog
index 7a0a08dce712..8bc147e42ad8 100644
--- a/x11-libs/libXaw3d/ChangeLog
+++ b/x11-libs/libXaw3d/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libXaw3d
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/ChangeLog,v 1.7 2012/02/15 23:53:15 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/ChangeLog,v 1.8 2012/03/05 09:42:47 ssuominen Exp $
+
+*libXaw3d-1.6.1-r1 (05 Mar 2012)
+
+  05 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +libXaw3d-1.6.1-r1.ebuild, +files/libXaw3d-1.6.1-use_after_free.patch:
+  Fix use after free in DestroyAllIM (causing segmentation fault in app-text/gv
+  exit) wrt #406487 by Matt Turner
 
 *libXaw3d-1.6.1 (15 Feb 2012)
 
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index fb5d89ad3370..5fe74929e5fb 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -3,22 +3,24 @@ Hash: SHA1
 
 AUX Xaw3d-out-of-tree.diff 232 RMD160 eb692178879bea30915f835aa95e39aac1946d77 SHA1 9b1f1cc5b7413f45e0dd2c65e7e2972566e55ede SHA256 0b4c2c01aad13f404f0ae106ea5420f534efdb3252ae4d689419171aad1651d7
 AUX Xaw3d-xfree86.diff 420 RMD160 e81d2490cbf5a51c12f31a967f9ac63219cb05db SHA1 f61648d67769bbfa88fa81bfb10dacee554f40cf SHA256 a36da9169200e316c6ae83647c19e404b92f59eed596b6bc1561c9dba3054d3b
+AUX libXaw3d-1.6.1-use_after_free.patch 1176 RMD160 f4ac9a870e0ebc9b1af51a6b951f0b96e9872cdc SHA1 aa7923eb345c48d7d4d99c184f9792b56653d854 SHA256 736ac2a9aa8a6b65866806830230b404c46be04586592c46d89cc6b7c33b7f7a
 DIST Xaw3d-1.5.tar.gz 284420 RMD160 b2e03f0684aa71f8acc8cc35d3bb0edacbb86a1e SHA1 ba10e9f9a376932eed9696006e34d4618a6f588d SHA256 41866c4926f6d77c7ed5f8776c1c02cd060d593830112b28ad4e5d43c143df08
 DIST libXaw3d-1.6.1.tar.bz2 551108 RMD160 49a689a449bdcac07dfb261498285f3c4f909d00 SHA1 e8da0b904459af6e769b0fb2c9bc34a560126e86 SHA256 9cd43caabb9e17d7d06c6e156cace9f7b7849c60662f61561dbf44c1eea10971
 DIST libXaw3d-1.6.tar.bz2 545034 RMD160 afebb1802dfa9d485d60b39f9165ceb4ff8204e1 SHA1 b10489c3cc9dde46bd13294ee971b1a782e0a4be SHA256 1122082f2b3c484557c6147768300c356453918bf401e2e6c86fee12ade93325
 EBUILD libXaw3d-1.5-r1.ebuild 2196 RMD160 712df3e70778da9c1203c507f42c399f0dc9e4ba SHA1 55429e3cd35e34a9424a1c3c8d7a6c47470ca2b9 SHA256 2644e6ce15f8e6a5254a515b9c88bb598e86ca36410a33c9655946b3a37c335d
 EBUILD libXaw3d-1.6-r1.ebuild 847 RMD160 8d27496e639b800e530d02451f2dceb1dda3fe78 SHA1 ed65776c025ed5dffebb1b725c05feda01df0bbb SHA256 b7f0c8874be734a2be9bf9a382e58b3f1fc7592a6d15a9f17dc71965f4193d0b
+EBUILD libXaw3d-1.6.1-r1.ebuild 719 RMD160 163f5e8bf169af6447593e4b4a90d0e5206419ad SHA1 5f469eff8527d87dc0ba28b287ec8a888f22b182 SHA256 cc0c00d8f712720538f1d63149de27d83663a885b97aa71978f9706bac4c265e
 EBUILD libXaw3d-1.6.1.ebuild 663 RMD160 3dd798b5adf6ab250a7e7f2b17ee236de77e6b1e SHA1 0c2b7213a2512ba65caacd65ea95c7273317a1b7 SHA256 0d7cbea87d1ea3925ef83378e67b4f2105553edf2ecc413b5b9183ef6bc8d161
-MISC ChangeLog 4452 RMD160 95333714524dba820c3f71cdf07bbca93fbc9faf SHA1 012fc7fed8c17c447fc985f0368e0b458e600360 SHA256 cfe7ca4ba30315150190066b871f830b4b72352763ac3a469e622a8ff31d1ae6
+MISC ChangeLog 4730 RMD160 f0da6de44f5dd3ab39f824cc518e0ec5c71a2c44 SHA1 1c9156685c77ad0ba446535399cabc0e7c1ebe5a SHA256 fb7fcb5ee7a7468320d2300579f28ec3e80207046ff1fa43aca53061e91015ca
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPPhT2AAoJEEdUh39IaPFNWvQIAIIywrrjr8aZGHwp8Akj9Lxx
-8t9aJqO8nqEzoRYINdX7cBNADyyoBFXafxCDSohvOuYhoYJF/A3eR4EUf0+q/+HI
-4GKPS2bM1IOzdQ+TdxxM2QmsY1X5YnCn8eTUGFVRWMUdv+7TugV4T7oZOEKrYF+Q
-6jQBQImR4iCudzxpKgEfE2Ang5NstEDTL/8p2sFenh1PaIsLhom1+DHWZs9J+fat
-asrliw1FyL4ZMDetmml0tHDUWTGNLzGsFIsdJeb/XuMvAcaXTSBxcY/kPwaQgYXj
-W0rqoKgSiwSyODW4LSBxzE0oX2GG0hW7Ozc7a1AvmKep+dssbSRUcG1nV/7UT2U=
-=0aOp
+iQEcBAEBAgAGBQJPVIpaAAoJEEdUh39IaPFNOv8IAIerqwBXZ+iosTnpqf0WdrGt
+pgezzvru8wq8Wav4QsJDd9JpnUiJ2VTuKEMxW4ON7dp2Cgw4v9b/3LyUAsNk6EEw
+ep7g8o90h1E7yy5ZBAoZtePm8DUINV7JWg+xk5FiC6Pue/C553RgCuQPj+nxHYeY
+R/qE7IYERSF6WafQPsWmzKFT726I7L/aNTlV/Mn4JWOfGgD6nIdg+rJDJfH0sQUZ
+FbT11YLQZjhXZrOYvw4CmmfkIA/WoeYT/k9qFN2w+nwHxOK8HBXtuA6Pb13tNPOA
+5OZuvIt0XqTiMlkHENzdgXtjW4xwc1z+jsLUcGoXyiE+YhTAAyI5vqtgvOh38m4=
+=Q5z4
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libXaw3d/files/libXaw3d-1.6.1-use_after_free.patch b/x11-libs/libXaw3d/files/libXaw3d-1.6.1-use_after_free.patch
new file mode 100644
index 000000000000..c419462299c0
--- /dev/null
+++ b/x11-libs/libXaw3d/files/libXaw3d-1.6.1-use_after_free.patch
@@ -0,0 +1,39 @@
+From f435c05c64bc20557d901170b76f6bce8506ed48 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 1 Mar 2012 16:48:23 -0500
+Subject: [PATCH libXaw3d] Fix use-after-free in DestroyAllIM
+
+Fixes segmentation fault when closing gv.
+
+Found at http://gitorious.org/xaw3d/xaw3d/commit/23b3ca50395f180cba4a923eb8827dcc961629da
+
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=406487
+Signed-off-by: Matt Turner <mattst88@gmail.com>
+---
+Original author of this patch is unknown. If you know, let me know and
+I'll fix the attribution.
+
+ src/XawIm.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/XawIm.c b/src/XawIm.c
+index 82a94b1..00562b5 100644
+--- a/src/XawIm.c
++++ b/src/XawIm.c
+@@ -320,12 +320,12 @@ DestroyAllIM(XawVendorShellExtPart *ve)
+     /*
+      * Close Input Method
+      */
+-    CloseIM(ve);
+     if (!XFindContext(XDisplayOfIM(ve->im.xim), (Window)ve->im.xim, errContext,
+ 		      (XPointer*)&contextErrData)) {
+ 	if (contextErrData) XtFree((char *)contextErrData);
+     }
+     XDeleteContext(XDisplayOfIM(ve->im.xim), (Window)ve->im.xim, errContext);
++    CloseIM(ve);
+     ve->im.xim = NULL;
+ 
+     /*
+-- 
+1.7.3.4
+
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.1-r1.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..a91aa79bff25
--- /dev/null
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw3d/libXaw3d-1.6.1-r1.ebuild,v 1.1 2012/03/05 09:42:47 ssuominen Exp $
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw3d library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="unicode"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-use_after_free.patch )
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable unicode internationalization)
+		)
+
+	xorg-2_pkg_setup
+}