[vorbis-tools] 02/05: Fix oggenc crash on closing raw input files by backporting r19117 from upstream

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch debian/wheezy
in repository vorbis-tools.

commit 0caeac71f0e43160a177a3ff57b72b60b44a16cf
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Sat Nov 29 10:26:46 2014 +0100

    Fix oggenc crash on closing raw input files by backporting r19117 from upstream
---
 ...x-oggenc-crash-on-closing-raw-input-files.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/0009-Fix-oggenc-crash-on-closing-raw-input-files.patch b/debian/patches/0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
new file mode 100644
index 0000000..654bedc
--- /dev/null
+++ b/debian/patches/0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
+Date: Sat, 29 Nov 2014 10:57:11 +0100
+Subject: Fix oggenc crash on closing raw input files
+
+Origin: backport, https://trac.xiph.org/changeset/19117/trunk/vorbis-tools/oggenc
+Author: Gregory Maxwell <greg at xiph.org>
+
+Fixes a crash of oggenc on closing of any raw input file. The problem was
+a function call using a function pointer that had become invalid when
+a variable that was still referenced by a pointer ran out of scope.
+---
+ oggenc/oggenc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c
+index 5c36fea..7ad9303 100644
+--- a/oggenc/oggenc.c
++++ b/oggenc/oggenc.c
+@@ -97,6 +97,8 @@ int main(int argc, char **argv)
+               .3,-1,
+               0,0,0.f,
+               0, 0, 0, 0, 0};
++    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
++      N_("RAW file reader")};
+ 
+     int i;
+ 
+@@ -239,8 +241,6 @@ int main(int argc, char **argv)
+ 
+         if(opt.rawmode)
+         {
+-            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
+-                N_("RAW file reader")};
+ 
+             enc_opts.rate=opt.raw_samplerate;
+             enc_opts.channels=opt.raw_channels;
diff --git a/debian/patches/series b/debian/patches/series
index 21e9cb6..db451f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 no_debian_subdir.diff
+0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
 0015-Fix-Large-alloca-on-bad-AIFF-input-CVE-2015-6749.patch
 0016-Validate-channel-count-in-audio-header.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/vorbis-tools.git