Fix segfault when freeing argv in the multilib patch. Closes bug #80518.

Package-Manager: portage-2.0.51-r15

5 files changed, 18 insertions, 11 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index a7eacb1b671d..9f0f0c416e1d 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.136 2005/02/02 06:41:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.137 2005/02/06 06:09:23 eradicator Exp $
+
+*distcc-2.18.3-r4 (05 Feb 2005)
+
+  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/distcc-gentoo-multilib-r1.patch, -distcc-2.18.3-r3.ebuild,
+  +distcc-2.18.3-r4.ebuild:
+  Fix segfault when freeing argv in the multilib patch.  Closes bug #80518.
 
 *distcc-2.18.3-r3 (30 Jan 2005)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 665206f6e4f4..54f6131082f0 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8cbfe6845aa6eacead07d129bf01d44f ChangeLog 24916
+MD5 96d3a0bf78a4b950bf02a304eed7db8c ChangeLog 25178
 MD5 226fbaefb55345566d2a38d00f6dc160 distcc-2.16-r2.ebuild 4844
 MD5 2f7d9eaca2df59be318eb50fc2f2e2f5 distcc-2.18.3-r2.ebuild 4791
 MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375
-MD5 fd08841e0a314575e7b1fa21ac5363ee distcc-2.18.3-r3.ebuild 4795
+MD5 71814b963a24a7fd295433932da974b1 distcc-2.18.3-r4.ebuild 4795
 MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64
 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r2 66
 MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
 MD5 687a622f11f457581b267ce5fb3c2721 files/distcc-gentoo-multilib.patch 3784
-MD5 426c3b233a54fd1d6af3d56ab30a522d files/distcc-gentoo-multilib-r1.patch 4203
-MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r3 66
+MD5 ec06b50c03c5002d4df60e49b9798445 files/distcc-gentoo-multilib-r1.patch 4245
+MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r4 66
 MD5 69a089566bd18a1bfba2da639964c19e files/2.17/conf 1317
 MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733
 MD5 bb53a18e009ef62f4402a23f83bfda20 files/2.18/conf 1384
@@ -19,7 +19,7 @@ MD5 739ebfc62fe125b76021cf7987a158f7 files/2.18/init 733
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCAHY0ArHZZzCEUG0RAsJ9AJ9jsb2DTedaewu7PVZtoOqAOeUBTQCeMUAT
-WexmSgJsjhkiVeWpkkZrM7g=
-=V4k3
+iD8DBQFCBbSdArHZZzCEUG0RAs0EAJ9Q1wxfUb7xd5rGKJxPonTviv6krQCfXIQM
+hXu9C9VskQw8whjSY2vS3Z8=
+=FZK9
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-2.18.3-r3.ebuild b/sys-devel/distcc/distcc-2.18.3-r4.ebuild
index d9f0c384e6ac..5e937952cf4e 100644
--- a/sys-devel/distcc/distcc-2.18.3-r3.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r3.ebuild,v 1.1 2005/02/02 06:41:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r4.ebuild,v 1.1 2005/02/06 06:09:24 eradicator Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r3 b/sys-devel/distcc/files/digest-distcc-2.18.3-r4
index 7f1ca5e12714..7f1ca5e12714 100644
--- a/sys-devel/distcc/files/digest-distcc-2.18.3-r3
+++ b/sys-devel/distcc/files/digest-distcc-2.18.3-r4
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
index 9ded9e0e43c8..8a7b37e878bb 100644
--- a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
+++ b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
@@ -126,7 +126,7 @@ diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
 +            goto out;
 +        }
 +        dcc_find_compiler(newargv, &compiler_args);
-+        free(newargv);
++        if (newargv != argv) free(newargv);
          /* compiler_args is now respectively either "cc -c hello.c" or
           * "gcc -c hello.c" */
  
@@ -140,7 +140,7 @@ diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
 +            goto out;
 +        }
 +        dcc_copy_argv(newargv, &compiler_args, 0);
-+        free(newargv);
++        if (newargv != argv) free(newargv);
          compiler_args[0] = compiler_name;
      }