From: Antonio Larrosa <larrosa@kde.org>
Date: Mon, 6 Mar 2017 18:59:26 +0100
Subject: Actually fail when error occurs in parseFormat

When there's an unsupported number of bits per sample or an invalid
number of samples per block, don't only print an error message using
the error handler, but actually stop parsing the file.

This fixes #35 (also reported at
https://bugzilla.opensuse.org/show_bug.cgi?id=1026983 and
https://blogs.gentoo.org/ago/2017/02/20/audiofile-heap-based-buffer-overflow-in-imadecodeblockwave-ima-cpp/
)
---
 libaudiofile/WAVE.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libaudiofile/WAVE.cpp b/libaudiofile/WAVE.cpp
index 0fc48e8..d04b796 100644
--- a/libaudiofile/WAVE.cpp
+++ b/libaudiofile/WAVE.cpp
@@ -332,6 +332,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
 			{
 				_af_error(AF_BAD_NOT_IMPLEMENTED,
 					"IMA ADPCM compression supports only 4 bits per sample");
+				return AF_FAIL;
 			}
 
 			int bytesPerBlock = (samplesPerBlock + 14) / 8 * 4 * channelCount;
@@ -339,6 +340,7 @@ status WAVEFile::parseFormat(const Tag &id, uint32_t size)
 			{
 				_af_error(AF_BAD_CODEC_CONFIG,
 					"Invalid samples per block for IMA ADPCM compression");
+				return AF_FAIL;
 			}
 
 			track->f.sampleWidth = 16;
7785fc'>tree</a><a href='/guix/commit/etc/gnu-store.mount.in?id=82946b0583d58daab979a5d883526049517785fc'>commit</a><a href='/guix/diff/etc/gnu-store.mount.in?id=82946b0583d58daab979a5d883526049517785fc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/gnu-store.mount.in'>
<input type='hidden' name='id' value='82946b0583d58daab979a5d883526049517785fc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=82946b0583d58daab979a5d883526049517785fc'>root</a>/<a href='/guix/log/etc?id=82946b0583d58daab979a5d883526049517785fc'>etc</a>/<a href='/guix/log/etc/gnu-store.mount.in?id=82946b0583d58daab979a5d883526049517785fc'>gnu-store.mount.in</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/gnu-store.mount.in?id=82946b0583d58daab979a5d883526049517785fc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-16 15:37:41 +0200'>2020-05-16</span></td><td><a href='/guix/commit/etc/gnu-store.mount.in?id=1a1faa78b0498fbb71f1533beb4b65817c1d3f2a'>etc: Add a systemd unit to bind-mount @storedir@ read-only.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
'left'>Commit message (<a href='/guix/log/gnu/packages/patches/coreutils-cut-huge-range-test.patch?id=0054564b857c6ce2469ea2a7d0096ec31b3f80d9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-04-08 23:27:08 +0200'>2017-04-08</span></td><td><a href='/guix/commit/gnu/packages/patches/coreutils-cut-huge-range-test.patch?id=1cbd63f20527fd9c18d11e5e33c2817efe71c1ef'>gnu: coreutils: Update to 8.27.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-03-25 23:31:10 +0100'>2017-03-25</span></td><td><a href='/guix/commit/gnu/packages/patches/coreutils-cut-huge-range-test.patch?id=d1e3f59c9b8d1be79eded04fe23cceb56b4372f0'>gnu: coreutils: Patch 'cut' unit test on ARM.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>