From: Peter Levine <plevine457@gmail.com>
Date: Sun, 23 Sep 2018 05:17:48 +0000 (-0400)
Subject: media-libs/audiofile: Fix audiofile-0.3.6-CVE-2015-7747.patch
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9e3ac4da44223dd11e0f948d98a42b87595c8590;p=gentoo.git

media-libs/audiofile: Fix audiofile-0.3.6-CVE-2015-7747.patch

Fixes audiofile-0.3.6-CVE-2015-7747.patch which
otherwise depends on changes from a previous Debian patch.

Signed-off-by: Peter Levine <plevine457@gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9953
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---

diff --git a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch
index 332563959106..4f1a0d95beca 100644
--- a/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch
+++ b/media-libs/audiofile/files/audiofile-0.3.6-CVE-2015-7747.patch
@@ -35,7 +35,7 @@ Bug-Debian: https://bugs.debian.org/801102
  
 --- /dev/null
 +++ b/test/sixteen-stereo-to-eight-mono.c
-@@ -0,0 +1,118 @@
+@@ -0,0 +1,117 @@
 +/*
 +	Audio File Library
 +
@@ -95,8 +95,8 @@ Bug-Debian: https://bugs.debian.org/801102
 +	afInitSampleFormat(setup, AF_DEFAULT_TRACK, AF_SAMPFMT_TWOSCOMP, 16);
 +	afInitChannels(setup, AF_DEFAULT_TRACK, 2);
 +
-+	char *testFileName;
-+	if (!createTemporaryFile("sixteen-to-eight", &testFileName))
++	char testFileName[PATH_MAX];
++	if (!createTemporaryFile("sixteen-to-eight", testFileName))
 +	{
 +		fprintf(stderr, "Could not create temporary file.\n");
 +		exit(EXIT_FAILURE);
@@ -150,7 +150,6 @@ Bug-Debian: https://bugs.debian.org/801102
 +
 +	afCloseFile(file);
 +	unlink(testFileName);
-+	free(testFileName);
 +
 +	exit(EXIT_SUCCESS);
 +}