diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-21 12:48:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-21 12:48:03 +0200 |
| commit | 78abcd7df7ad967c44c884773cc7d39cf3c811a9 (patch) | |
| tree | dfc2b6c3a61cdae149965ec1eff0a14b93d76898 | |
| parent | 23dce21647b6b7f3f9ddcb9ad267decf2c7388f0 (diff) | |
| download | mpd-78abcd7df7ad967c44c884773cc7d39cf3c811a9.tar.gz mpd-78abcd7df7ad967c44c884773cc7d39cf3c811a9.tar.xz mpd-78abcd7df7ad967c44c884773cc7d39cf3c811a9.zip | |
decoer/dsdiff: fix endless loop on malformed file
Same bug as in the previous commit.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/decoder/DsdiffDecoderPlugin.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ ver 0.18.13 (not yet released) * decoder - - dsf: fix endless loop on malformed file + - dsdiff, dsf: fix endless loop on malformed file - ffmpeg: support ffmpeg/libav version 11 ver 0.18.12 (2014/07/30) diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx index 60b2e7624..767395215 100644 --- a/src/decoder/DsdiffDecoderPlugin.cxx +++ b/src/decoder/DsdiffDecoderPlugin.cxx @@ -377,7 +377,7 @@ dsdiff_decode_chunk(Decoder &decoder, InputStream &is, const unsigned buffer_samples = buffer_frames * frame_size; const size_t buffer_size = buffer_samples * sample_size; - while (chunk_size > 0) { + while (chunk_size >= frame_size) { /* see how much aligned data from the remaining chunk fits into the local buffer */ size_t now_size = buffer_size; |