Fix bug #281718 -- *** glibc detected *** gtali: free(): invalid pointer. Caused by a snippet of code which tried to free a static string (.ro_data). Remove old revision

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 43 insertions, 14 deletions

diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index ff95246bc713..125e45adf834 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/gnome-games
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.274 2009/07/19 11:05:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.275 2009/08/17 11:09:22 mrpouet Exp $
+
+*gnome-games-2.26.3-r1 (17 Aug 2009)
+
+  17 Aug 2009; Romain Perier <mrpouet@gentoo.org> -gnome-games-2.26.3.ebuild,
+  +gnome-games-2.26.3-r1.ebuild,
+  +files/gnome-games-2.26.3-gtali-invalid-pointer.patch:
+  Fix bug #281718 -- *** glibc detected *** gtali: free(): invalid pointer.
+  Caused by a snippet of code which tried to free a static string
+  (.ro_data). Remove old revision.
 
 *gnome-games-2.26.3 (19 Jul 2009)
 
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index 486f17fe6440..137da6926c39 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-games-2.14.0-no_lazy_bindings.patch 524 RMD160 1829b3f68998e195e4ff865982ff1818063ee604 SHA1 d63f49e339ce3d146920f7ac081c927145267eb0 SHA256 1d77a19b5d940ff23ee3110feb1ccc37a920e722c2cc0304abaf7a745cfab99d
 AUX gnome-games-2.26.2-parallel-make.patch 12693 RMD160 6a856fbf555ff9a9c5d998762f9d6a171ba2fc88 SHA1 e3dc134eb42b52a839f05d6705d370890c68e83e SHA256 6791aa96a17ca8869832fd89aa79f8d4e2d17d4e08f2cc0f93bfc43f7fa3e884
+AUX gnome-games-2.26.3-gtali-invalid-pointer.patch 1145 RMD160 905fa0574296c70a4653914b81cf391205a660d8 SHA1 7384fecdd16fc3b6bf7e10bdd950ab2f8df877ce SHA256 b75190460f701c1830a8eae85c46de23a3735329f840d21383a60ca4445adac0
 AUX gnome-games-2.26.3-implicit-declaration.patch 319 RMD160 c6d868784160c6e10c046d6e117ce6206e1dd49f SHA1 1fa72d174f676b594c61dabb232a9e3a3b98b726 SHA256 7a113e54b4fe50a0d49c5b7b842a03b7f8c494e9f4ee42e9f0ae883dd1bfddcb
 DIST gnome-games-2.24.3.tar.bz2 19195003 RMD160 705f075e37c46e652e42e222aea82fa657a2b948 SHA1 f5de0d20bd51f188a9ac1e5f1ceaaa82d8f85882 SHA256 6ad3c849ea10f47c76cbf9c34a5e413b2549c919c5c388be0c42c59bcf3a388d
 DIST gnome-games-2.26.2.tar.bz2 23124681 RMD160 9d2bea14db0dcf63dee42677584e20a37be778c5 SHA1 c7de7b61431a10fbe287431b08d23c9e67c069fb SHA256 b7fb95a945453795aeccd91525a40d0c517220cc392f093113407e707d019429
 DIST gnome-games-2.26.3.tar.bz2 24664606 RMD160 54ae263d943e2cf7dad2f1e160d7a2756e0ca573 SHA1 0b859be03e6f25a43ed4ad41d6022b9bc83635fc SHA256 f29849507bd2a29a747b73f412fcbc8c74f3a9b5bf38d4b763b4242ac84cf46f
 EBUILD gnome-games-2.24.3.ebuild 3861 RMD160 6c457c066a26b8b89903b9cbec11a395a1fe96fb SHA1 c6f93a7fc6d14e56527c4945f0a2830b49ccda59 SHA256 e18a52ef00b3f2c69e5287f367df4253f5694efa88a6cfbe13aa0e65c714b497
 EBUILD gnome-games-2.26.2-r1.ebuild 4476 RMD160 e7b4ac49b07952c12ff2eee83f8d83b100788738 SHA1 5995da89f4258de96b5539890b5dd906860e0a02 SHA256 3bb69c6994865ccc7aa0557e54ef3d33dcec1b36152605baf608bc61ce310758
-EBUILD gnome-games-2.26.3.ebuild 4602 RMD160 4c39a40dd7dbea59a1abbc20a738496b9358b575 SHA1 13d4f1015c774a55c2c1bb609621128f7661ffdf SHA256 51522702bd91d76db20b6e29cc2cd2e88e37da1d8fbf00e5720b26cd1ba7561d
-MISC ChangeLog 36521 RMD160 1356c27740bfefd51e5c4fda572146a6396d8fbc SHA1 87374250ce5a742a3849553f4c9260167a69d62b SHA256 9c7f4f25f6f6735dac45b01dafd6ac34ade50baaa5073c39801a37c6fc24b08c
+EBUILD gnome-games-2.26.3-r1.ebuild 4741 RMD160 594b4c5998b2ebe8f8e5334f120edf68f9299b40 SHA1 d46868ae154a500a7751510c7dbed5ec21e1bbc9 SHA256 2254f48791742ca0e7ba717b868475c0925538e9b571680e6cded780860b2db8
+MISC ChangeLog 36909 RMD160 0a3eadc0efa0cd95201ac85e18e98fb5475909c1 SHA1 9b4306473d5f3c77699bb7a279929d503cdcb2ba SHA256 e00fef83b9a9c0fc8cba1338bf1314d7fb4a2c787df8c2b93613858630a80f76
 MISC metadata.xml 246 RMD160 f99719fd9820b6c6943b2d0072f01177246a027b SHA1 68e2e7a60349b9a89beaa2d3bcb8d82bf1da4a8d SHA256 a21e910d2b0b2cfed695a77d8c5ccff533decd21ae4b46e8c57d0d3368f8e140
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpi/gQACgkQ1fmVwcYIWAabtwCgusyw+v7bI1robdCQzuTY741q
-ulYAnjhijSWfcAjHN8QPkrd201qHM14i
-=u6fh
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.26.3-gtali-invalid-pointer.patch b/gnome-extra/gnome-games/files/gnome-games-2.26.3-gtali-invalid-pointer.patch
new file mode 100644
index 000000000000..20178765e4b8
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.26.3-gtali-invalid-pointer.patch
@@ -0,0 +1,26 @@
+Fix *** glibc detected *** gtali: free(): invalid pointer.
+
+This error happened in case where default players names was used, 
+in yahtzee.c "Human" string is just marked by N_() to be translated later (runtime), 
+but not really translated (so "Human" is assigned to DefaultPlayerNames[0]).
+In players[0].name the translated string is assigned ie _("Human").
+This implies that "if (players[0].name != DefaultPlayerNames[0])" 
+is always true because _("Human") hasn't the same address as "Human".
+And we can't free a string allocated in .ro_data section. 
+
+ gtali/setup.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gtali/setup.c b/gtali/setup.c
+index eb16614..36f6e81 100644
+--- a/gtali/setup.c
++++ b/gtali/setup.c
+@@ -149,7 +149,7 @@ do_setup (GtkWidget * widget, gpointer data)
+   DisplayComputerThoughts = tmpDisplayComputerThoughts;
+ 
+   for (i = 0; i < MAX_NUMBER_OF_PLAYERS; i++) {
+-    if (players[i].name != DefaultPlayerNames[i])
++    if (players[i].name != _(DefaultPlayerNames[i]))
+       g_free (players[i].name);
+     players[i].name =
+       g_strdup (gtk_entry_get_text (GTK_ENTRY (PlayerNames[i])));
diff --git a/gnome-extra/gnome-games/gnome-games-2.26.3.ebuild b/gnome-extra/gnome-games/gnome-games-2.26.3-r1.ebuild
index c432f8d3c8d3..41332b69e13b 100644
--- a/gnome-extra/gnome-games/gnome-games-2.26.3.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.26.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.26.3.ebuild,v 1.1 2009/07/19 11:05:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.26.3-r1.ebuild,v 1.1 2009/08/17 11:09:22 mrpouet Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -123,6 +123,9 @@ src_prepare() {
 	# Fix implicit declaration of yylex.
 	epatch "${FILESDIR}/${PN}-2.26.3-implicit-declaration.patch"
 
+	# Fix bug #281718 -- *** glibc detected *** gtali: free(): invalid pointer
+	epatch "${FILESDIR}/${P}-gtali-invalid-pointer.patch"
+
 	# If calling eautoreconf, this ebuild uses libtool-2
 	eautomake
 }