[vorbis-tools] 01/03: oggdec: Don't ignore stream errors

[Martin Steghöfer]

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

martin.steghoefer-guest pushed a commit to branch master
in repository vorbis-tools.

commit 938c0e1bfe092a300b262fc24485bb358d22ce12
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Fri Dec 12 12:39:54 2014 +0100

    oggdec: Don't ignore stream errors
---
 .../patches/0013-Don-t-ignore-stream-errors.patch  | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/0013-Don-t-ignore-stream-errors.patch b/debian/patches/0013-Don-t-ignore-stream-errors.patch
new file mode 100644
index 0000000..7945a0b
--- /dev/null
+++ b/debian/patches/0013-Don-t-ignore-stream-errors.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
+Date: Fri, 12 Dec 2014 12:38:21 +0100
+Subject: Don't ignore stream errors
+
+---
+ oggdec/oggdec.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/oggdec/oggdec.c b/oggdec/oggdec.c
+index a99f95d..16f87ac 100644
+--- a/oggdec/oggdec.c
++++ b/oggdec/oggdec.c
+@@ -310,12 +310,19 @@ static int decode_file(FILE *in, FILE *out, char *infile, char *outfile)
+             }
+         }
+ 
+-        if(ret < 0 ) {
+-           if( !quiet ) {
+-               fprintf(stderr, _("WARNING: hole in data (%d)\n"), ret);
+-           }
++        if(ret == OV_HOLE) {
++            if(!quiet) {
++                fprintf(stderr, _("WARNING: hole in data (%d)\n"), ret);
++            }
+             continue;
+         }
++        else if(ret < 0) {
++            if(!quiet) {
++                fprintf(stderr, _("=== Vorbis library reported a stream error.\n"));
++            }
++            ov_clear(&vf);
++            return 1;
++        }
+ 
+         if(channels > 2 && !raw) {
+           /* Then permute! */
diff --git a/debian/patches/series b/debian/patches/series
index b31bf12..bbc559d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0010-Truncate-long-status-lines-on-small-terminals.patch
 0011-Fix-ogg123-speex-stereo-Initialize-stereo-info-data-.patch
 0012-Fix-ogg123-speex-playback-Initialize-channel-matrix.patch
+0013-Don-t-ignore-stream-errors.patch

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