<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e53808a20719cc3a588d37c208ac0560ef2d991">https://github.com/macports/macports-ports/commit/9e53808a20719cc3a588d37c208ac0560ef2d991</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9e53808a207 libmad: add security patches from Debian
</span>9e53808a207 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e53808a20719cc3a588d37c208ac0560ef2d991
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Apr 11 08:02:31 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> libmad: add security patches from Debian
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix CVE-2017-8372, CVE-2017-8373, and CVE-2017-8374.
</span>---
audio/libmad/Portfile | 7 +-
audio/libmad/files/length-check.patch | 817 ++++++++++++++++++++++++++++++++++
audio/libmad/files/md_size.diff | 58 +++
3 files changed, 879 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libmad/Portfile b/audio/libmad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc14eae649e..46c79a227f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libmad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libmad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name libmad
version 0.15.1b
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories audio
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,8 @@ master_sites ftp://ftp.mars.org/pub/mpeg/ \
</span> sourceforge:mad
checksums rmd160 0f3415ee10b188681e282ca69dec74c46ca73b0f \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 502379
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +35,7 @@ post-extract {
</span> touch ${worksrcpath}/AUTHORS ${worksrcpath}/ChangeLog ${worksrcpath}/NEWS
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff automake.patch remove-optimizations.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-configure.ac.diff automake.patch remove-optimizations.patch md_size.diff length-check.patch
</span>
post-patch {
reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/mad.pc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libmad/files/length-check.patch b/audio/libmad/files/length-check.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..708c7148a3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libmad/files/length-check.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,817 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Kurt Roeckx <kurt@roeckx.be>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 28 Jan 2018 19:26:36 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Check the size before reading with mad_bit_read
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+There are various cases where it attemps to read past the end of the buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+using mad_bit_read(). Most functions didn't even know the size of the buffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+they were reading from.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: bit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bit.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bit.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register unsigned long value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (len == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bitptr->left == CHAR_BIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitptr->cache = *bitptr->byte;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frame.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frame.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,11 +120,18 @@ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int decode_header(struct mad_header *header, struct mad_stream *stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int index;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mad_bitptr bufend_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header->flags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header->private_bits = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&bufend_ptr, stream->bufend);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* header() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &bufend_ptr) < 32) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_BUFLEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* syncword */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_bit_skip(&stream->ptr, 11);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,8 +232,13 @@ int decode_header(struct mad_header *hea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* error_check() */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* crc_check */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (header->flags & MAD_FLAG_PROTECTION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (header->flags & MAD_FLAG_PROTECTION) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &bufend_ptr) < 16) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_BUFLEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header->crc_target = mad_bit_read(&stream->ptr, 16);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -338,7 +350,7 @@ int mad_header_decode(struct mad_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->error = MAD_ERROR_BUFLEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto fail;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* mark point where frame sync word was expected */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->this_frame = ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->next_frame = ptr + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,6 +373,8 @@ int mad_header_decode(struct mad_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptr = mad_bit_nextbyte(&stream->ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_NONE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* begin processing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->this_frame = ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->next_frame = ptr + 1; /* possibly bogus sync word */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -413,7 +427,7 @@ int mad_header_decode(struct mad_header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* check that a valid frame header follows this frame */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptr = stream->next_frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptr = stream->next_frame = stream->this_frame + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto sync;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: layer12.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- layer12.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ layer12.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * DESCRIPTION: decode one requantized Layer I sample from a bitstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb, struct mad_stream *stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_fixed_t sample;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mad_bitptr frameend_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&frameend_ptr, stream->next_frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(ptr, &frameend_ptr) < nb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sample = mad_bit_read(ptr, nb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* invert most significant bit, extend sign, then scale to fixed format */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,6 +114,10 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mad_header *header = &frame->header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int nch, bound, ch, s, sb, nb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char allocation[2][32], scalefactor[2][32];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mad_bitptr bufend_ptr, frameend_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&bufend_ptr, stream->bufend);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&frameend_ptr, stream->next_frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nch = MAD_NCHANNELS(header);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,6 +130,11 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* check CRC word */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (header->flags & MAD_FLAG_PROTECTION) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &bufend_ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ < 4 * (bound * nch + (32 - bound))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_BADCRC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header->crc_check =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header->crc_check);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,6 +150,11 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = 0; sb < bound; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nb = mad_bit_read(&stream->ptr, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nb == 15) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,6 +167,11 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = bound; sb < 32; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nb = mad_bit_read(&stream->ptr, 4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nb == 15) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,6 +188,11 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = 0; sb < 32; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (allocation[ch][sb]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined(OPT_STRICT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,8 +217,10 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nb = allocation[ch][sb];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->sbsample[ch][s][sb] = nb ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mad_f_mul(I_sample(&stream->ptr, nb),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_f_mul(I_sample(&stream->ptr, nb, stream),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sf_table[scalefactor[ch][sb]]) : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (stream->error != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +228,14 @@ int mad_layer_I(struct mad_stream *strea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nb = allocation[0][sb])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_fixed_t sample;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sample = I_sample(&stream->ptr, nb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < nb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sample = I_sample(&stream->ptr, nb, stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (stream->error != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->sbsample[ch][s][sb] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,13 +321,21 @@ struct quantclass {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void II_samples(struct mad_bitptr *ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct quantclass const *quantclass,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mad_fixed_t output[3])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_fixed_t output[3], struct mad_stream *stream)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int nb, s, sample[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mad_bitptr frameend_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&frameend_ptr, stream->next_frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((nb = quantclass->group)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int c, nlevels;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(ptr, &frameend_ptr) < quantclass->bits) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* degrouping */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = mad_bit_read(ptr, quantclass->bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nlevels = quantclass->nlevels;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -299,8 +348,14 @@ void II_samples(struct mad_bitptr *ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nb = quantclass->bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (s = 0; s < 3; ++s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (s = 0; s < 3; ++s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(ptr, &frameend_ptr) < nb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sample[s] = mad_bit_read(ptr, nb);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (s = 0; s < 3; ++s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -336,6 +391,9 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char const *offsets;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_fixed_t samples[3];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mad_bitptr frameend_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&frameend_ptr, stream->next_frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nch = MAD_NCHANNELS(header);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,13 +460,24 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = 0; sb < bound; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nbal = bitalloc_table[offsets[sb]].nbal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (ch = 0; ch < nch; ++ch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = bound; sb < sblimit; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nbal = bitalloc_table[offsets[sb]].nbal;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allocation[0][sb] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -417,8 +486,14 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = 0; sb < sblimit; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (allocation[ch][sb])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (allocation[ch][sb]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -441,6 +516,11 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (sb = 0; sb < sblimit; ++sb) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (allocation[ch][sb]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (scfsi[ch][sb]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -451,11 +531,21 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* fall through */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 3:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -487,7 +577,9 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((index = allocation[ch][sb])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- II_samples(&stream->ptr, &qc_table[index], samples);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ II_samples(&stream->ptr, &qc_table[index], samples, stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (stream->error != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (s = 0; s < 3; ++s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame->sbsample[ch][3 * gr + s][sb] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -505,7 +597,9 @@ int mad_layer_II(struct mad_stream *stre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((index = allocation[0][sb])) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- II_samples(&stream->ptr, &qc_table[index], samples);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ II_samples(&stream->ptr, &qc_table[index], samples, stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (stream->error != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (s = 0; s < 3; ++s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: layer3.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- layer3.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ layer3.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct channel *channel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct channel *gr1ch, int mode_extension)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct channel *gr1ch, int mode_extension,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits_left, unsigned int *part2_length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mad_bitptr start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int scalefac_compress, index, slen[4], part, n, i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -644,8 +645,12 @@ unsigned int III_scalefactors_lsf(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ n = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (part = 0; part < 4; ++part) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; i < nsfb[part]; ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (i = 0; i < nsfb[part]; ++i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen[part])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[n++] = mad_bit_read(ptr, slen[part]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen[part];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (n < 39)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -690,7 +695,10 @@ unsigned int III_scalefactors_lsf(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max = (1 << slen[part]) - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < nsfb[part]; ++i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen[part])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is_pos = mad_bit_read(ptr, slen[part]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen[part];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[n] = is_pos;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gr1ch->scalefac[n++] = (is_pos == max);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -703,7 +711,8 @@ unsigned int III_scalefactors_lsf(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return mad_bit_length(&start, ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *part2_length = mad_bit_length(&start, ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_NONE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -712,7 +721,8 @@ unsigned int III_scalefactors_lsf(struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct channel const *gr0ch, unsigned int scfsi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct channel const *gr0ch, unsigned int scfsi,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits_left, unsigned int *part2_length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mad_bitptr start;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int slen1, slen2, sfbi;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -728,12 +738,20 @@ unsigned int III_scalefactors(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sfbi = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (nsfb--)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (nsfb--) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsfb = 6 * 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (nsfb--)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (nsfb--) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsfb = 1 * 3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (nsfb--)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -745,8 +763,12 @@ unsigned int III_scalefactors(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (sfbi = 0; sfbi < 6; ++sfbi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (sfbi = 0; sfbi < 6; ++sfbi) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (scfsi & 0x4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -754,8 +776,12 @@ unsigned int III_scalefactors(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (sfbi = 6; sfbi < 11; ++sfbi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (sfbi = 6; sfbi < 11; ++sfbi) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (scfsi & 0x2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -763,8 +789,12 @@ unsigned int III_scalefactors(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (sfbi = 11; sfbi < 16; ++sfbi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (sfbi = 11; sfbi < 16; ++sfbi) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (scfsi & 0x1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -772,14 +802,19 @@ unsigned int III_scalefactors(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (sfbi = 16; sfbi < 21; ++sfbi)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (sfbi = 16; sfbi < 21; ++sfbi) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < slen2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADSCFSI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= slen2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ channel->scalefac[21] = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return mad_bit_length(&start, ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *part2_length = mad_bit_length(&start, ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_NONE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -933,19 +968,17 @@ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct channel *channel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned char const *sfbwidth,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unsigned int part2_length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ signed int part3_length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signed int exponents[39], exp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signed int const *expptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mad_bitptr peek;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- signed int bits_left, cachesz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ signed int bits_left, cachesz, fakebits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register mad_fixed_t *xrptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_fixed_t const *sfbound;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register unsigned long bitcache;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bits_left = (signed) channel->part2_3_length - (signed) part2_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (bits_left < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return MAD_ERROR_BADPART3LEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left = part3_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ III_exponents(channel, sfbwidth, exponents);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -956,8 +989,12 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz = mad_bit_bitsleft(&peek);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < cachesz) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cachesz = bits_left;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitcache = mad_bit_read(&peek, cachesz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bits_left -= cachesz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fakebits = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xrptr = &xr[0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -986,7 +1023,7 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ big_values = channel->big_values;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (big_values-- && cachesz + bits_left > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (big_values-- && cachesz + bits_left - fakebits > 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union huffpair const *pair;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int clumpsz, value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register mad_fixed_t requantized;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1023,10 +1060,19 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bits = ((32 - 1 - 21) + (21 - cachesz)) & ~7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < bits) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits = bits_left;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bits_left -= bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz < 21) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits = 21 - cachesz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bitcache <<= bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cachesz += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fakebits += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* hcod (0..19) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1041,6 +1087,8 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz -= pair->value.hlen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz < fakebits)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (linbits) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* x (0..14) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1054,10 +1102,15 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 15:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cachesz < linbits + 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bitcache = (bitcache << 16) | mad_bit_read(&peek, 16);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cachesz += 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bits_left -= 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < 16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits = bits_left;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cachesz += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < linbits)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value += MASK(bitcache, cachesz, linbits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz -= linbits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1074,6 +1127,8 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x_final:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -requantized : requantized;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1089,10 +1144,15 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 15:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cachesz < linbits + 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bitcache = (bitcache << 16) | mad_bit_read(&peek, 16);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cachesz += 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bits_left -= 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < 16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits = bits_left;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cachesz += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < linbits)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value += MASK(bitcache, cachesz, linbits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz -= linbits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1109,6 +1169,8 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ y_final:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -requantized : requantized;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1128,6 +1190,8 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requantized = reqcache[value] = III_requantize(value, exp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -requantized : requantized;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1146,6 +1210,8 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requantized = reqcache[value] = III_requantize(value, exp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADHUFFDATA;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -requantized : requantized;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1155,9 +1221,6 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (cachesz + bits_left < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return MAD_ERROR_BADHUFFDATA; /* big_values overrun */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* count1 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union huffquad const *table;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1167,15 +1230,24 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requantized = III_requantize(1, exp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (cachesz + bits_left > 0 && xrptr <= &xr[572]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (cachesz + bits_left - fakebits > 0 && xrptr <= &xr[572]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union huffquad const *quad;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* hcod (1..6) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cachesz < 10) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bitcache = (bitcache << 16) | mad_bit_read(&peek, 16);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cachesz += 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bits_left -= 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits = 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (bits_left < 16)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits = bits_left;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bitcache = (bitcache << bits) | mad_bit_read(&peek, bits);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cachesz += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz < 10) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int bits = 10 - cachesz;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bitcache <<= bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cachesz += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fakebits += bits;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quad = &table[MASK(bitcache, cachesz, 4)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1188,6 +1260,11 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MASK(bitcache, cachesz, quad->ptr.bits)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (cachesz - fakebits < quad->value.hlen + quad->value.v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ + quad->value.w + quad->value.x + quad->value.y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* We don't have enough bits to read one more entry, consider them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * stuffing bits. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cachesz -= quad->value.hlen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (xrptr == sfbound) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1236,22 +1313,8 @@ enum mad_error III_huffdecode(struct mad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xrptr += 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (cachesz + bits_left < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if 0 && defined(DEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr, "huffman count1 overrun (%d bits)\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -(cachesz + bits_left));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* technically the bitstream is misformatted, but apparently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- some encoders are just a bit sloppy with stuffing bits */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xrptr -= 4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert(-bits_left <= MAD_BUFFER_GUARD * CHAR_BIT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if 0 && defined(DEBUG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (bits_left < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "read %d bits too many\n", -bits_left);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2348,10 +2411,11 @@ void III_freqinver(mad_fixed_t sample[18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct sideinfo *si, unsigned int nch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct sideinfo *si, unsigned int nch, unsigned int md_len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct mad_header *header = &frame->header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int sfreqi, ngr, gr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int bits_left = md_len * CHAR_BIT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int sfreq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2383,6 +2447,7 @@ enum mad_error III_decode(struct mad_bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (ch = 0; ch < nch; ++ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct channel *channel = &granule->ch[ch];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int part2_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned int part3_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sfbwidth[ch] = sfbwidth_table[sfreqi].l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (channel->block_type == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2391,18 +2456,30 @@ enum mad_error III_decode(struct mad_bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (header->flags & MAD_FLAG_LSF_EXT) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- part2_length = III_scalefactors_lsf(ptr, channel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = III_scalefactors_lsf(ptr, channel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ch == 0 ? 0 : &si->gr[1].ch[1],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- header->mode_extension);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ header->mode_extension, bits_left, &part2_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- part2_length = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gr == 0 ? 0 : si->scfsi[ch]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gr == 0 ? 0 : si->scfsi[ch], bits_left, &part2_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= part2_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (part2_length > channel->part2_3_length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADPART3LEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ part3_length = channel->part2_3_length - part2_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (part3_length > bits_left)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return MAD_ERROR_BADPART3LEN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part3_length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bits_left -= part3_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* joint stereo processing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2519,11 +2596,13 @@ int mad_layer_III(struct mad_stream *str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int nch, priv_bitlen, next_md_begin = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int si_len, data_bitlen, md_len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int frame_space, frame_used, frame_free;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct mad_bitptr ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct mad_bitptr ptr, bufend_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct sideinfo si;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum mad_error error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int result = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&bufend_ptr, stream->bufend);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* allocate Layer III dynamic structures */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (stream->main_data == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2587,14 +2666,15 @@ int mad_layer_III(struct mad_stream *str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned long header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_bit_init(&peek, stream->next_frame);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mad_bit_length(&peek, &bufend_ptr) >= 57) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ header = mad_bit_read(&peek, 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(header & 0x00010000L)) /* protection_bit */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_skip(&peek, 16); /* crc_check */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- header = mad_bit_read(&peek, 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(header & 0x00010000L)) /* protection_bit */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mad_bit_skip(&peek, 16); /* crc_check */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- next_md_begin =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ next_md_begin =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mad_bit_finish(&peek);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2653,7 +2733,7 @@ int mad_layer_III(struct mad_stream *str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* decode main_data */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (result == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error = III_decode(&ptr, frame, &si, nch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error = III_decode(&ptr, frame, &si, nch, md_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream->error = error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = -1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libmad/files/md_size.diff b/audio/libmad/files/md_size.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9372bd73dfe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libmad/files/md_size.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,58 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Kurt Roeckx <kurt@roeckx.be>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 28 Jan 2018 15:44:08 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Check the size of the main data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The main data to decode a frame can come from the current frame and part of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+previous frame, the so called bit reservoir. si.main_data_begin is the part of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the previous frame we need for this frame. frame_space is the amount of main
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+data that can be in this frame, and next_md_begin is the part of this frame that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is going to be used for the next frame.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The maximum amount of data from a previous frame that the format allows is 511
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bytes. The maximum frame size for the defined bitrates is at MPEG 2.5 layer 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+at 320 kbit/s and 8 kHz sample rate which gives 72 * (320000 / 8000) + 1 = 2881.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+So those defines are not large enough:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MAD_BUFFER_GUARD 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MAD_BUFFER_MDLEN (511 + 2048 + MAD_BUFFER_GUARD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+There is also support for a "free" bitrate which allows you to create any frame
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+size, which can be larger than the buffer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Changing the defines is not an option since it's part of the ABI, so we check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that the main data fits in the bufer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The previous frame data is stored in *stream->main_data and contains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+stream->md_len bytes. If stream->md_len is larger than the data we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+need from the previous frame (si.main_data_begin) it still wouldn't fit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in the buffer, so just keep the data that we need.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: layer3.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- layer3.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ layer3.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2608,6 +2608,11 @@ int mad_layer_III(struct mad_stream *str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ next_md_begin = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md_len = si.main_data_begin + frame_space - next_md_begin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->error = MAD_ERROR_LOSTSYNC;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->sync = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frame_used = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2625,8 +2630,11 @@ int mad_layer_III(struct mad_stream *str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mad_bit_init(&ptr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *stream->main_data + stream->md_len - si.main_data_begin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ memmove(stream->main_data,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *stream->main_data + stream->md_len - si.main_data_begin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ si.main_data_begin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ stream->md_len = si.main_data_begin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mad_bit_init(&ptr, *stream->main_data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (md_len > si.main_data_begin) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert(stream->md_len + md_len -
</span></pre><pre style='margin:0'>
</pre>