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

(Portage version: 2.0.51-r15)

4 files changed, 11 insertions, 4 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/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;
      }