diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-06 06:09:24 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-06 06:09:24 +0000 |
| commit | 48be4cbb7edbbb31b7c7307b37997c2a6f79d430 (patch) | |
| tree | 53555dde55b2bd8a528c6c5158145dc0e73f5ea2 /sys-devel/distcc/files | |
| parent | s390 KEYWORDS #80718 (diff) | |
| download | gentoo-2-48be4cbb7edbbb31b7c7307b37997c2a6f79d430.tar.gz gentoo-2-48be4cbb7edbbb31b7c7307b37997c2a6f79d430.tar.bz2 gentoo-2-48be4cbb7edbbb31b7c7307b37997c2a6f79d430.zip | |
Fix segfault when freeing argv in the multilib patch. Closes bug #80518.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-devel/distcc/files')
| -rw-r--r-- | sys-devel/distcc/files/digest-distcc-2.18.3-r4 (renamed from sys-devel/distcc/files/digest-distcc-2.18.3-r3) | 0 | ||||
| -rw-r--r-- | sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch | 4 |
2 files changed, 2 insertions, 2 deletions
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; } |