Update FLAC to 1.3.1

src/libFLAC/stream_decoder.c

 /* libFLAC - Free Lossless Audio Codec library
- * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
+ * Copyright (C) 2000-2009  Josh Coalson
+ * Copyright (C) 2011-2014  Xiph.Org Foundation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * - Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
  * - Redistributions in binary form must reproduce the above copyright
  * notice, this list of conditions and the following disclaimer in the
  * documentation and/or other materials provided with the distribution.
  *
  * - Neither the name of the Xiph.org Foundation nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
-#if defined _MSC_VER || defined __MINGW32__
-#include <io.h> /* for _setmode() */
-#include <fcntl.h> /* for _O_BINARY */
-#endif
-#if defined __CYGWIN__ || defined __EMX__
-#include <io.h> /* for setmode(), O_BINARY */
-#include <fcntl.h> /* for _O_BINARY */
-#endif
 #include <stdio.h>
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memset/memcpy() */
 #include <sys/stat.h> /* for stat() */
 #include <sys/types.h> /* for off_t */
-#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
-#if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */
-#define fseeko fseek
-#define ftello ftell
-#else
-#define fseeko _fseeki64
-#define ftello _ftelli64
-#endif
-#endif
+#include "share/compat.h"
 #include "FLAC/assert.h"
 #include "share/alloc.h"
 #include "protected/stream_decoder.h"
 #include "private/bitreader.h"
 #include "private/bitmath.h"
 #include "private/cpu.h"
 #include "private/crc.h"
 #include "private/fixed.h"
 #include "private/format.h"
 #include "private/lpc.h"
 #include "private/md5.h"
 #include "private/memory.h"
-
-#ifdef max
-#undef max
-#endif
-#define max(a,b) ((a)>(b)?(a):(b))
-
-/* adjust for compilers that can't understand using LLU suffix for uint64_t literals */
-#ifdef _MSC_VER
-#define FLAC__U64L(x) x
-#else
-#define FLAC__U64L(x) x##LLU
-#endif
+#include "private/macros.h"
 
 
 /* technically this should be in an "export.c" but this is convenient enough */
 FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC =
 #if FLAC__HAS_OGG
         1
 #else
         0
 #endif
 ;
 
 
 /***********************************************************************
  *
  * Private static data
  *
  ***********************************************************************/
 
-static FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' };
+static const FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' };
 
 /***********************************************************************
  *
  * Private class method prototypes
  *
  ***********************************************************************/
 
 static void set_defaults_(FLAC__StreamDecoder *decoder);
 static FILE *get_binary_stdin_(void);
 static FLAC__bool allocate_output_(FLAC__StreamDecoder *decoder, unsigned size, unsigned channels);
 static FLAC__bool has_id_filtered_(FLAC__StreamDecoder *decoder, FLAC__byte *id);
 static FLAC__bool find_metadata_(FLAC__StreamDecoder *decoder);
 static FLAC__bool read_metadata_(FLAC__StreamDecoder *decoder);
 static FLAC__bool read_metadata_streaminfo_(FLAC__StreamDecoder *decoder, FLAC__bool is_last, unsigned length);
 static FLAC__bool read_metadata_seektable_(FLAC__StreamDecoder *decoder, FLAC__bool is_last, unsigned length);
-static FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj);
+static FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj, unsigned length);
 static FLAC__bool read_metadata_cuesheet_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_CueSheet *obj);
 static FLAC__bool read_metadata_picture_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_Picture *obj);
 static FLAC__bool skip_id3v2_tag_(FLAC__StreamDecoder *decoder);
 static FLAC__bool frame_sync_(FLAC__StreamDecoder *decoder);
 static FLAC__bool read_frame_(FLAC__StreamDecoder *decoder, FLAC__bool *got_a_frame, FLAC__bool do_full_decode);
 static FLAC__bool read_frame_header_(FLAC__StreamDecoder *decoder);
 static FLAC__bool read_subframe_(FLAC__StreamDecoder *decoder, unsigned channel, unsigned bps, FLAC__bool do_full_decode);
 static FLAC__bool read_subframe_constant_(FLAC__StreamDecoder *decoder, unsigned channel, unsigned bps, FLAC__bool do_full_decode);
 static FLAC__bool read_subframe_fixed_(FLAC__StreamDecoder *decoder, unsigned channel, unsigned bps, const unsigned order, FLAC__bool do_full_decode);
 static FLAC__bool read_subframe_lpc_(FLAC__StreamDecoder *decoder, unsigned channel, unsigned bps, const unsigned order, FLAC__bool do_full_decode);
@@ skipping 34 matching lines @@
         FLAC__StreamDecoderEofCallback eof_callback;
         FLAC__StreamDecoderWriteCallback write_callback;
         FLAC__StreamDecoderMetadataCallback metadata_callback;
         FLAC__StreamDecoderErrorCallback error_callback;
         /* generic 32-bit datapath: */
         void (*local_lpc_restore_signal)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
         /* generic 64-bit datapath: */
         void (*local_lpc_restore_signal_64bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
         /* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit): */
         void (*local_lpc_restore_signal_16bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-        /* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit), AND order <= 8: */
-        void (*local_lpc_restore_signal_16bit_order8)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-        FLAC__bool (*local_bitreader_read_rice_signed_block)(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
         void *client_data;
         FILE *file; /* only used if FLAC__stream_decoder_init_file()/FLAC__stream_decoder_init_file() called, else NULL */
         FLAC__BitReader *input;
         FLAC__int32 *output[FLAC__MAX_CHANNELS];
         FLAC__int32 *residual[FLAC__MAX_CHANNELS]; /* WATCHOUT: these are the aligned pointers; the real pointers that should be free()'d are residual_unaligned[] below */
         FLAC__EntropyCodingMethod_PartitionedRiceContents partitioned_rice_contents[FLAC__MAX_CHANNELS];
         unsigned output_capacity, output_channels;
         FLAC__uint32 fixed_block_size, next_fixed_block_size;
         FLAC__uint64 samples_decoded;
         FLAC__bool has_stream_info, has_seek_table;
@@ skipping 93 matching lines @@
  * Class constructor/destructor
  *
  ***********************************************************************/
 FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void)
 {
         FLAC__StreamDecoder *decoder;
         unsigned i;
 
         FLAC__ASSERT(sizeof(int) >= 4); /* we want to die right away if this is not true */
 
-        decoder = (FLAC__StreamDecoder*)calloc(1, sizeof(FLAC__StreamDecoder));
+        decoder = calloc(1, sizeof(FLAC__StreamDecoder));
         if(decoder == 0) {
                 return 0;
         }
 
-        decoder->protected_ = (FLAC__StreamDecoderProtected*)calloc(1, sizeof(FLAC__StreamDecoderProtected));
+        decoder->protected_ = calloc(1, sizeof(FLAC__StreamDecoderProtected));
         if(decoder->protected_ == 0) {
                 free(decoder);
                 return 0;
         }
 
-        decoder->private_ = (FLAC__StreamDecoderPrivate*)calloc(1, sizeof(FLAC__StreamDecoderPrivate));
+        decoder->private_ = calloc(1, sizeof(FLAC__StreamDecoderPrivate));
         if(decoder->private_ == 0) {
                 free(decoder->protected_);
                 free(decoder);
                 return 0;
         }
 
         decoder->private_->input = FLAC__bitreader_new();
         if(decoder->private_->input == 0) {
                 free(decoder->private_);
                 free(decoder->protected_);
                 free(decoder);
                 return 0;
         }
 
         decoder->private_->metadata_filter_ids_capacity = 16;
-        if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)malloc((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) * decoder->private_->metadata_filter_ids_capacity))) {
+        if(0 == (decoder->private_->metadata_filter_ids = malloc((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) * decoder->private_->metadata_filter_ids_capacity))) {
                 FLAC__bitreader_delete(decoder->private_->input);
                 free(decoder->private_);
                 free(decoder->protected_);
                 free(decoder);
                 return 0;
         }
 
         for(i = 0; i < FLAC__MAX_CHANNELS; i++) {
                 decoder->private_->output[i] = 0;
                 decoder->private_->residual_unaligned[i] = decoder->private_->residual[i] = 0;
@@ skipping 12 matching lines @@
 
         decoder->protected_->state = FLAC__STREAM_DECODER_UNINITIALIZED;
 
         return decoder;
 }
 
 FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder)
 {
         unsigned i;
 
-        FLAC__ASSERT(0 != decoder);
+        if (decoder == NULL)
+                return ;
+
         FLAC__ASSERT(0 != decoder->protected_);
         FLAC__ASSERT(0 != decoder->private_);
         FLAC__ASSERT(0 != decoder->private_->input);
 
         (void)FLAC__stream_decoder_finish(decoder);
 
         if(0 != decoder->private_->metadata_filter_ids)
                 free(decoder->private_->metadata_filter_ids);
 
         FLAC__bitreader_delete(decoder->private_->input);
@@ skipping 40 matching lines @@
                 0 == read_callback ||
                 0 == write_callback ||
                 0 == error_callback ||
                 (seek_callback && (0 == tell_callback || 0 == length_callback || 0 == eof_callback))
         )
                 return FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS;
 
 #if FLAC__HAS_OGG
         decoder->private_->is_ogg = is_ogg;
         if(is_ogg && !FLAC__ogg_decoder_aspect_init(&decoder->protected_->ogg_decoder_aspect))
-                return decoder->protected_->state = FLAC__STREAM_DECODER_OGG_ERROR;
+                return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE;
 #endif
 
         /*
          * get the CPU info and set the function pointers
          */
         FLAC__cpu_info(&decoder->private_->cpuinfo);
         /* first default to the non-asm routines */
         decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal;
         decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide;
         decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal;
-        decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal;
-        decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block;
         /* now override with asm where appropriate */
 #ifndef FLAC__NO_ASM
         if(decoder->private_->cpuinfo.use_asm) {
 #ifdef FLAC__CPU_IA32
                 FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
 #ifdef FLAC__HAS_NASM
-#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */
-                if(decoder->private_->cpuinfo.data.ia32.bswap)
-                        decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap;
-#endif
-                if(decoder->private_->cpuinfo.data.ia32.mmx) {
+                decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide_asm_ia32; /* OPT_IA32: was really necessary for GCC < 4.9 */
+                if(decoder->private_->cpuinfo.ia32.mmx) {
                         decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32;
                         decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32_mmx;
-                        decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_asm_ia32_mmx;
                 }
                 else {
                         decoder->private_->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_ia32;
                         decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ia32;
-                        decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_asm_ia32;
                 }
 #endif
-#elif defined FLAC__CPU_PPC
-                FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_PPC);
-                if(decoder->private_->cpuinfo.data.ppc.altivec) {
-                        decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_asm_ppc_altivec_16;
-                        decoder->private_->local_lpc_restore_signal_16bit_order8 = FLAC__lpc_restore_signal_asm_ppc_altivec_16_order8;
+#ifdef FLAC__HAS_X86INTRIN
+# if defined FLAC__SSE2_SUPPORTED && !defined FLAC__HAS_NASM /* OPT_SSE: not better than MMX asm */
+                if(decoder->private_->cpuinfo.ia32.sse2) {
+                        decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_16_intrin_sse2;
                 }
+# endif
+# if defined FLAC__SSE4_1_SUPPORTED
+                if(decoder->private_->cpuinfo.ia32.sse41) {
+                        decoder->private_->local_lpc_restore_signal_64bit = FLAC__lpc_restore_signal_wide_intrin_sse41;
+                }
+# endif
+#endif
+#elif defined FLAC__CPU_X86_64
+                FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_X86_64);
+                /* No useful SSE optimizations yet */
 #endif
         }
 #endif
 
         /* from here on, errors are fatal */
 
-        if(!FLAC__bitreader_init(decoder->private_->input, decoder->private_->cpuinfo, read_callback_, decoder)) {
+        if(!FLAC__bitreader_init(decoder->private_->input, read_callback_, decoder)) {
                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                 return FLAC__STREAM_DECODER_INIT_STATUS_MEMORY_ALLOCATION_ERROR;
         }
 
         decoder->private_->read_callback = read_callback;
         decoder->private_->seek_callback = seek_callback;
         decoder->private_->tell_callback = tell_callback;
         decoder->private_->length_callback = length_callback;
         decoder->private_->eof_callback = eof_callback;
         decoder->private_->write_callback = write_callback;
@@ skipping 80 matching lines @@
         FLAC__StreamDecoderMetadataCallback metadata_callback,
         FLAC__StreamDecoderErrorCallback error_callback,
         void *client_data,
         FLAC__bool is_ogg
 )
 {
         FLAC__ASSERT(0 != decoder);
         FLAC__ASSERT(0 != file);
 
         if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED)
-                return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED;
+                return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED;
 
         if(0 == write_callback || 0 == error_callback)
-                return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS;
+                return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS;
 
         /*
          * To make sure that our file does not go unclosed after an error, we
          * must assign the FILE pointer before any further error can occur in
          * this routine.
          */
         if(file == stdin)
                 file = get_binary_stdin_(); /* just to be safe */
 
         decoder->private_->file = file;
@@ skipping 50 matching lines @@
         FILE *file;
 
         FLAC__ASSERT(0 != decoder);
 
         /*
          * To make sure that our file does not go unclosed after an error, we
          * have to do the same entrance checks here that are later performed
          * in FLAC__stream_decoder_init_FILE() before the FILE* is assigned.
          */
         if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED)
-                return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED;
+                return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_ALREADY_INITIALIZED;
 
         if(0 == write_callback || 0 == error_callback)
-                return decoder->protected_->state = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS;
+                return decoder->protected_->initstate = FLAC__STREAM_DECODER_INIT_STATUS_INVALID_CALLBACKS;
 
-        file = filename? fopen(filename, "rb") : stdin;
+        file = filename? flac_fopen(filename, "rb") : stdin;
 
         if(0 == file)
                 return FLAC__STREAM_DECODER_INIT_STATUS_ERROR_OPENING_FILE;
 
         return init_FILE_internal_(decoder, file, write_callback, metadata_callback, error_callback, client_data, is_ogg);
 }
 
 FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_file(
         FLAC__StreamDecoder *decoder,
         const char *filename,
@@ skipping 23 matching lines @@
         FLAC__bool md5_failed = false;
         unsigned i;
 
         FLAC__ASSERT(0 != decoder);
         FLAC__ASSERT(0 != decoder->private_);
         FLAC__ASSERT(0 != decoder->protected_);
 
         if(decoder->protected_->state == FLAC__STREAM_DECODER_UNINITIALIZED)
                 return true;
 
-        /* see the comment in FLAC__seekable_stream_decoder_reset() as to why we
+        /* see the comment in FLAC__stream_decoder_reset() as to why we
          * always call FLAC__MD5Final()
          */
         FLAC__MD5Final(decoder->private_->computed_md5sum, &decoder->private_->md5context);
 
         if(decoder->private_->has_seek_table && 0 != decoder->private_->seek_table.data.seek_table.points) {
                 free(decoder->private_->seek_table.data.seek_table.points);
                 decoder->private_->seek_table.data.seek_table.points = 0;
                 decoder->private_->has_seek_table = false;
         }
         FLAC__bitreader_free(decoder->private_->input);
@@ skipping 92 matching lines @@
         FLAC__ASSERT(0 != id);
         if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED)
                 return false;
 
         if(decoder->private_->metadata_filter[FLAC__METADATA_TYPE_APPLICATION])
                 return true;
 
         FLAC__ASSERT(0 != decoder->private_->metadata_filter_ids);
 
         if(decoder->private_->metadata_filter_ids_count == decoder->private_->metadata_filter_ids_capacity) {
-                if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2))) {
+                if(0 == (decoder->private_->metadata_filter_ids = safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2))) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                         return false;
                 }
                 decoder->private_->metadata_filter_ids_capacity *= 2;
         }
 
         memcpy(decoder->private_->metadata_filter_ids + decoder->private_->metadata_filter_ids_count * (FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8), id, (FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8));
         decoder->private_->metadata_filter_ids_count++;
 
         return true;
@@ skipping 38 matching lines @@
         FLAC__ASSERT(0 != id);
         if(decoder->protected_->state != FLAC__STREAM_DECODER_UNINITIALIZED)
                 return false;
 
         if(!decoder->private_->metadata_filter[FLAC__METADATA_TYPE_APPLICATION])
                 return true;
 
         FLAC__ASSERT(0 != decoder->private_->metadata_filter_ids);
 
         if(decoder->private_->metadata_filter_ids_count == decoder->private_->metadata_filter_ids_capacity) {
-                if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2))) {
+                if(0 == (decoder->private_->metadata_filter_ids = safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2))) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                         return false;
                 }
                 decoder->private_->metadata_filter_ids_capacity *= 2;
         }
 
         memcpy(decoder->private_->metadata_filter_ids + decoder->private_->metadata_filter_ids_count * (FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8), id, (FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8));
         decoder->private_->metadata_filter_ids_count++;
 
         return true;
@@ skipping 423 matching lines @@
  * This will forcibly set stdin to binary mode (for OSes that require it)
  */
 FILE *get_binary_stdin_(void)
 {
         /* if something breaks here it is probably due to the presence or
          * absence of an underscore before the identifiers 'setmode',
          * 'fileno', and/or 'O_BINARY'; check your system header files.
          */
 #if defined _MSC_VER || defined __MINGW32__
         _setmode(_fileno(stdin), _O_BINARY);
-#elif defined __CYGWIN__ 
+#elif defined __CYGWIN__
         /* almost certainly not needed for any modern Cygwin, but let's be safe... */
         setmode(_fileno(stdin), _O_BINARY);
 #elif defined __EMX__
         setmode(fileno(stdin), O_BINARY);
 #endif
 
         return stdin;
 }
 
 FLAC__bool allocate_output_(FLAC__StreamDecoder *decoder, unsigned size, unsigned channels)
@@ skipping 17 matching lines @@
                 }
         }
 
         for(i = 0; i < channels; i++) {
                 /* WATCHOUT:
                  * FLAC__lpc_restore_signal_asm_ia32_mmx() requires that the
                  * output arrays have a buffer of up to 3 zeroes in front
                  * (at negative indices) for alignment purposes; we use 4
                  * to keep the data well-aligned.
                  */
-                tmp = (FLAC__int32*)safe_malloc_muladd2_(sizeof(FLAC__int32), /*times (*/size, /*+*/4/*)*/);
+                tmp = safe_malloc_muladd2_(sizeof(FLAC__int32), /*times (*/size, /*+*/4/*)*/);
                 if(tmp == 0) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                         return false;
                 }
                 memset(tmp, 0, sizeof(FLAC__int32)*4);
                 decoder->private_->output[i] = tmp + 4;
 
-                /* WATCHOUT:
-                 * minimum of quadword alignment for PPC vector optimizations is REQUIRED:
-                 */
                 if(!FLAC__memory_alloc_aligned_int32_array(size, &decoder->private_->residual_unaligned[i], &decoder->private_->residual[i])) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                         return false;
                 }
         }
 
         decoder->private_->output_capacity = size;
         decoder->private_->output_channels = channels;
 
         return true;
@@ skipping 29 matching lines @@
                 else {
                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, 8))
                                 return false; /* read_callback_ sets the state for us */
                 }
                 if(x == FLAC__STREAM_SYNC_STRING[i]) {
                         first = true;
                         i++;
                         id = 0;
                         continue;
                 }
+
+                if(id >= 3)
+                        return false;
+
                 if(x == ID3V2_TAG_[id]) {
                         id++;
                         i = 0;
                         if(id == 3) {
                                 if(!skip_id3v2_tag_(decoder))
                                         return false; /* skip_id3v2_tag_ sets the state for us */
                         }
                         continue;
                 }
                 id = 0;
                 if(x == 0xff) { /* MAGIC NUMBER for the first 8 frame sync bits */
                         decoder->private_->header_warmup[0] = (FLAC__byte)x;
                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, 8))
                                 return false; /* read_callback_ sets the state for us */
 
                         /* we have to check if we just read two 0xff's in a row; the second may actually be the beginning of the sync code */
                         /* else we have to check if the second byte is the end of a sync code */
                         if(x == 0xff) { /* MAGIC NUMBER for the first 8 frame sync bits */
                                 decoder->private_->lookahead = (FLAC__byte)x;
                                 decoder->private_->cached = true;
                         }
-                        else if(x >> 2 == 0x3e) { /* MAGIC NUMBER for the last 6 sync bits */
+                        else if(x >> 1 == 0x7c) { /* MAGIC NUMBER for the last 6 sync bits and reserved 7th bit */
                                 decoder->private_->header_warmup[1] = (FLAC__byte)x;
                                 decoder->protected_->state = FLAC__STREAM_DECODER_READ_FRAME;
                                 return true;
                         }
                 }
                 i = 0;
                 if(first) {
                         send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC);
                         first = false;
                 }
@@ skipping 36 matching lines @@
 
                 decoder->private_->has_seek_table = true;
                 if(!decoder->private_->is_seeking && decoder->private_->metadata_filter[FLAC__METADATA_TYPE_SEEKTABLE] && decoder->private_->metadata_callback)
                         decoder->private_->metadata_callback(decoder, &decoder->private_->seek_table, decoder->private_->client_data);
         }
         else {
                 FLAC__bool skip_it = !decoder->private_->metadata_filter[type];
                 unsigned real_length = length;
                 FLAC__StreamMetadata block;
 
+                memset(&block, 0, sizeof(block));
                 block.is_last = is_last;
                 block.type = (FLAC__MetadataType)type;
                 block.length = length;
 
                 if(type == FLAC__METADATA_TYPE_APPLICATION) {
                         if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.application.id, FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8))
                                 return false; /* read_callback_ sets the state for us */
 
                         if(real_length < FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) { /* underflow check */
                                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;/*@@@@@@ maybe wrong error? need to resync?*/
                                 return false;
                         }
 
                         real_length -= FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8;
 
                         if(decoder->private_->metadata_filter_ids_count > 0 && has_id_filtered_(decoder, block.data.application.id))
                                 skip_it = !skip_it;
                 }
 
                 if(skip_it) {
                         if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, real_length))
                                 return false; /* read_callback_ sets the state for us */
                 }
                 else {
+                        FLAC__bool ok = true;
                         switch(type) {
                                 case FLAC__METADATA_TYPE_PADDING:
                                         /* skip the padding bytes */
                                         if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, real_length))
-                                                return false; /* read_callback_ sets the state for us */
+                                                ok = false; /* read_callback_ sets the state for us */
                                         break;
                                 case FLAC__METADATA_TYPE_APPLICATION:
                                         /* remember, we read the ID already */
                                         if(real_length > 0) {
-                                                if(0 == (block.data.application.data = (FLAC__byte*)malloc(real_length))) {
+                                                if(0 == (block.data.application.data = malloc(real_length))) {
                                                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
-                                                        return false;
+                                                        ok = false;
                                                 }
-                                                if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.application.data, real_length))
-                                                        return false; /* read_callback_ sets the state for us */
+                                                else if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.application.data, real_length))
+                                                        ok = false; /* read_callback_ sets the state for us */
                                         }
                                         else
                                                 block.data.application.data = 0;
                                         break;
                                 case FLAC__METADATA_TYPE_VORBIS_COMMENT:
-                                        if(!read_metadata_vorbiscomment_(decoder, &block.data.vorbis_comment))
-                                                return false;
+                                        if(!read_metadata_vorbiscomment_(decoder, &block.data.vorbis_comment, real_length))
+                                                ok = false;
                                         break;
                                 case FLAC__METADATA_TYPE_CUESHEET:
                                         if(!read_metadata_cuesheet_(decoder, &block.data.cue_sheet))
-                                                return false;
+                                                ok = false;
                                         break;
                                 case FLAC__METADATA_TYPE_PICTURE:
                                         if(!read_metadata_picture_(decoder, &block.data.picture))
-                                                return false;
+                                                ok = false;
                                         break;
                                 case FLAC__METADATA_TYPE_STREAMINFO:
                                 case FLAC__METADATA_TYPE_SEEKTABLE:
                                         FLAC__ASSERT(0);
                                         break;
                                 default:
                                         if(real_length > 0) {
-                                                if(0 == (block.data.unknown.data = (FLAC__byte*)malloc(real_length))) {
+                                                if(0 == (block.data.unknown.data = malloc(real_length))) {
                                                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
-                                                        return false;
+                                                        ok = false;
                                                 }
-                                                if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.unknown.data, real_length))
-                                                        return false; /* read_callback_ sets the state for us */
+                                                else if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, block.data.unknown.data, real_length))
+                                                        ok = false; /* read_callback_ sets the state for us */
                                         }
                                         else
                                                 block.data.unknown.data = 0;
                                         break;
                         }
-                        if(!decoder->private_->is_seeking && decoder->private_->metadata_callback)
+                        if(ok && !decoder->private_->is_seeking && decoder->private_->metadata_callback)
                                 decoder->private_->metadata_callback(decoder, &block, decoder->private_->client_data);
 
                         /* now we have to free any malloc()ed data in the block */
                         switch(type) {
                                 case FLAC__METADATA_TYPE_PADDING:
                                         break;
                                 case FLAC__METADATA_TYPE_APPLICATION:
                                         if(0 != block.data.application.data)
                                                 free(block.data.application.data);
                                         break;
@@ skipping 24 matching lines @@
                                                 free(block.data.picture.data);
                                         break;
                                 case FLAC__METADATA_TYPE_STREAMINFO:
                                 case FLAC__METADATA_TYPE_SEEKTABLE:
                                         FLAC__ASSERT(0);
                                 default:
                                         if(0 != block.data.unknown.data)
                                                 free(block.data.unknown.data);
                                         break;
                         }
+
+                        if(!ok) /* anything that unsets "ok" should also make sure decoder->protected_->state is updated */
+                                return false;
                 }
         }
 
         if(is_last) {
                 /* if this fails, it's OK, it's just a hint for the seek routine */
                 if(!FLAC__stream_decoder_get_decode_position(decoder, &decoder->private_->first_frame_offset))
                         decoder->private_->first_frame_offset = 0;
                 decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
         }
 
@@ skipping 78 matching lines @@
 
         FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(decoder->private_->input));
 
         decoder->private_->seek_table.type = FLAC__METADATA_TYPE_SEEKTABLE;
         decoder->private_->seek_table.is_last = is_last;
         decoder->private_->seek_table.length = length;
 
         decoder->private_->seek_table.data.seek_table.num_points = length / FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 
         /* use realloc since we may pass through here several times (e.g. after seeking) */
-        if(0 == (decoder->private_->seek_table.data.seek_table.points = (FLAC__StreamMetadata_SeekPoint*)safe_realloc_mul_2op_(decoder->private_->seek_table.data.seek_table.points, decoder->private_->seek_table.data.seek_table.num_points, /*times*/sizeof(FLAC__StreamMetadata_SeekPoint)))) {
+        if(0 == (decoder->private_->seek_table.data.seek_table.points = safe_realloc_mul_2op_(decoder->private_->seek_table.data.seek_table.points, decoder->private_->seek_table.data.seek_table.num_points, /*times*/sizeof(FLAC__StreamMetadata_SeekPoint)))) {
                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                 return false;
         }
         for(i = 0; i < decoder->private_->seek_table.data.seek_table.num_points; i++) {
                 if(!FLAC__bitreader_read_raw_uint64(decoder->private_->input, &xx, FLAC__STREAM_METADATA_SEEKPOINT_SAMPLE_NUMBER_LEN))
                         return false; /* read_callback_ sets the state for us */
                 decoder->private_->seek_table.data.seek_table.points[i].sample_number = xx;
 
                 if(!FLAC__bitreader_read_raw_uint64(decoder->private_->input, &xx, FLAC__STREAM_METADATA_SEEKPOINT_STREAM_OFFSET_LEN))
                         return false; /* read_callback_ sets the state for us */
                 decoder->private_->seek_table.data.seek_table.points[i].stream_offset = xx;
 
                 if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_SEEKPOINT_FRAME_SAMPLES_LEN))
                         return false; /* read_callback_ sets the state for us */
                 decoder->private_->seek_table.data.seek_table.points[i].frame_samples = x;
         }
         length -= (decoder->private_->seek_table.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH);
         /* if there is a partial point left, skip over it */
         if(length > 0) {
                 /*@@@ do a send_error_to_client_() here?  there's an argument for either way */
                 if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, length))
                         return false; /* read_callback_ sets the state for us */
         }
 
         return true;
 }
 
-FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj)
+FLAC__bool read_metadata_vorbiscomment_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_VorbisComment *obj, unsigned length)
 {
         FLAC__uint32 i;
 
         FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(decoder->private_->input));
 
         /* read vendor string */
-        FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32);
-        if(!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length))
-                return false; /* read_callback_ sets the state for us */
-        if(obj->vendor_string.length > 0) {
-                if(0 == (obj->vendor_string.entry = (FLAC__byte*)safe_malloc_add_2op_(obj->vendor_string.length, /*+*/1))) {
-                        decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
-                        return false;
-                }
-                if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->vendor_string.entry, obj->vendor_string.length))
+        if (length >= 8) {
+                length -= 8; /* vendor string length + num comments entries alone take 8 bytes */
+                FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32);
+                if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length))
                         return false; /* read_callback_ sets the state for us */
-                obj->vendor_string.entry[obj->vendor_string.length] = '\0';
-        }
-        else
-                obj->vendor_string.entry = 0;
-
-        /* read num comments */
-        FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN == 32);
-        if(!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->num_comments))
-                return false; /* read_callback_ sets the state for us */
-
-        /* read comments */
-        if(obj->num_comments > 0) {
-                if(0 == (obj->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)safe_malloc_mul_2op_(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
-                        decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
-                        return false;
-                }
-                for(i = 0; i < obj->num_comments; i++) {
-                        FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32);
-                        if(!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->comments[i].length))
-                                return false; /* read_callback_ sets the state for us */
-                        if(obj->comments[i].length > 0) {
-                                if(0 == (obj->comments[i].entry = (FLAC__byte*)safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) {
-                                        decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
-                                        return false;
-                                }
-                                if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length))
-                                        return false; /* read_callback_ sets the state for us */
-                                obj->comments[i].entry[obj->comments[i].length] = '\0';
+                if (obj->vendor_string.length > 0) {
+                        if (length < obj->vendor_string.length) {
+                                obj->vendor_string.length = 0;
+                                obj->vendor_string.entry = 0;
+                                goto skip;
                         }
                         else
-                                obj->comments[i].entry = 0;
+                                length -= obj->vendor_string.length;
+                        if (0 == (obj->vendor_string.entry = safe_malloc_add_2op_(obj->vendor_string.length, /*+*/1))) {
+                                decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
+                                return false;
+                        }
+                        if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->vendor_string.entry, obj->vendor_string.length))
+                                return false; /* read_callback_ sets the state for us */
+                        obj->vendor_string.entry[obj->vendor_string.length] = '\0';
                 }
+                else
+                        obj->vendor_string.entry = 0;
+
+                /* read num comments */
+                FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_NUM_COMMENTS_LEN == 32);
+                if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->num_comments))
+                        return false; /* read_callback_ sets the state for us */
+
+                /* read comments */
+                if (obj->num_comments > 0) {
+                        if (0 == (obj->comments = safe_malloc_mul_2op_p(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
+                                decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
+                                return false;
+                        }
+                        for (i = 0; i < obj->num_comments; i++) {
+                                FLAC__ASSERT(FLAC__STREAM_METADATA_VORBIS_COMMENT_ENTRY_LENGTH_LEN == 32);
+                                if (length < 4) {
+                                        obj->num_comments = i;
+                                        goto skip;
+                                }
+                                else
+                                        length -= 4;
+                                if (!FLAC__bitreader_read_uint32_little_endian(decoder->private_->input, &obj->comments[i].length))
+                                        return false; /* read_callback_ sets the state for us */
+                                if (obj->comments[i].length > 0) {
+                                        if (length < obj->comments[i].length) {
+                                                obj->comments[i].length = 0;
+                                                obj->comments[i].entry = 0;
+                                                obj->num_comments = i;
+                                                goto skip;
+                                        }
+                                        else
+                                                length -= obj->comments[i].length;
+                                        if (0 == (obj->comments[i].entry = safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) {
+                                                decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
+                                                return false;
+                                        }
+                                        if (!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->comments[i].entry, obj->comments[i].length))
+                                                return false; /* read_callback_ sets the state for us */
+                                        obj->comments[i].entry[obj->comments[i].length] = '\0';
+                                }
+                                else
+                                        obj->comments[i].entry = 0;
+                        }
+                }
+                else
+                        obj->comments = 0;
         }
-        else {
-                obj->comments = 0;
+
+  skip:
+        if (length > 0) {
+                /* This will only happen on files with invalid data in comments */
+                if(!FLAC__bitreader_skip_byte_block_aligned_no_crc(decoder->private_->input, length))
+                        return false; /* read_callback_ sets the state for us */
         }
 
         return true;
 }
 
 FLAC__bool read_metadata_cuesheet_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_CueSheet *obj)
 {
         FLAC__uint32 i, j, x;
 
         FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(decoder->private_->input));
@@ skipping 12 matching lines @@
         obj->is_cd = x? true : false;
 
         if(!FLAC__bitreader_skip_bits_no_crc(decoder->private_->input, FLAC__STREAM_METADATA_CUESHEET_RESERVED_LEN))
                 return false; /* read_callback_ sets the state for us */
 
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_CUESHEET_NUM_TRACKS_LEN))
                 return false; /* read_callback_ sets the state for us */
         obj->num_tracks = x;
 
         if(obj->num_tracks > 0) {
-                if(0 == (obj->tracks = (FLAC__StreamMetadata_CueSheet_Track*)safe_calloc_(obj->num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)))) {
+                if(0 == (obj->tracks = safe_calloc_(obj->num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)))) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                         return false;
                 }
                 for(i = 0; i < obj->num_tracks; i++) {
                         FLAC__StreamMetadata_CueSheet_Track *track = &obj->tracks[i];
                         if(!FLAC__bitreader_read_raw_uint64(decoder->private_->input, &track->offset, FLAC__STREAM_METADATA_CUESHEET_TRACK_OFFSET_LEN))
                                 return false; /* read_callback_ sets the state for us */
 
                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_CUESHEET_TRACK_NUMBER_LEN))
                                 return false; /* read_callback_ sets the state for us */
@@ skipping 12 matching lines @@
                         track->pre_emphasis = x;
 
                         if(!FLAC__bitreader_skip_bits_no_crc(decoder->private_->input, FLAC__STREAM_METADATA_CUESHEET_TRACK_RESERVED_LEN))
                                 return false; /* read_callback_ sets the state for us */
 
                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_CUESHEET_TRACK_NUM_INDICES_LEN))
                                 return false; /* read_callback_ sets the state for us */
                         track->num_indices = (FLAC__byte)x;
 
                         if(track->num_indices > 0) {
-                                if(0 == (track->indices = (FLAC__StreamMetadata_CueSheet_Index*)safe_calloc_(track->num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)))) {
+                                if(0 == (track->indices = safe_calloc_(track->num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)))) {
                                         decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                                         return false;
                                 }
                                 for(j = 0; j < track->num_indices; j++) {
-                                        FLAC__StreamMetadata_CueSheet_Index *index = &track->indices[j];
-                                        if(!FLAC__bitreader_read_raw_uint64(decoder->private_->input, &index->offset, FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN))
+                                        FLAC__StreamMetadata_CueSheet_Index *indx = &track->indices[j];
+                                        if(!FLAC__bitreader_read_raw_uint64(decoder->private_->input, &indx->offset, FLAC__STREAM_METADATA_CUESHEET_INDEX_OFFSET_LEN))
                                                 return false; /* read_callback_ sets the state for us */
 
                                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_CUESHEET_INDEX_NUMBER_LEN))
                                                 return false; /* read_callback_ sets the state for us */
-                                        index->number = (FLAC__byte)x;
+                                        indx->number = (FLAC__byte)x;
 
                                         if(!FLAC__bitreader_skip_bits_no_crc(decoder->private_->input, FLAC__STREAM_METADATA_CUESHEET_INDEX_RESERVED_LEN))
                                                 return false; /* read_callback_ sets the state for us */
                                 }
                         }
                 }
         }
 
         return true;
 }
 
 FLAC__bool read_metadata_picture_(FLAC__StreamDecoder *decoder, FLAC__StreamMetadata_Picture *obj)
 {
         FLAC__uint32 x;
 
         FLAC__ASSERT(FLAC__bitreader_is_consumed_byte_aligned(decoder->private_->input));
 
         /* read type */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_PICTURE_TYPE_LEN))
                 return false; /* read_callback_ sets the state for us */
         obj->type = x;
 
         /* read MIME type */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN))
                 return false; /* read_callback_ sets the state for us */
-        if(0 == (obj->mime_type = (char*)safe_malloc_add_2op_(x, /*+*/1))) {
+        if(0 == (obj->mime_type = safe_malloc_add_2op_(x, /*+*/1))) {
                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                 return false;
         }
         if(x > 0) {
                 if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, (FLAC__byte*)obj->mime_type, x))
                         return false; /* read_callback_ sets the state for us */
         }
         obj->mime_type[x] = '\0';
 
         /* read description */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN))
                 return false; /* read_callback_ sets the state for us */
-        if(0 == (obj->description = (FLAC__byte*)safe_malloc_add_2op_(x, /*+*/1))) {
+        if(0 == (obj->description = safe_malloc_add_2op_(x, /*+*/1))) {
                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                 return false;
         }
         if(x > 0) {
                 if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->description, x))
                         return false; /* read_callback_ sets the state for us */
         }
         obj->description[x] = '\0';
 
         /* read width */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &obj->width, FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN))
                 return false; /* read_callback_ sets the state for us */
 
         /* read height */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &obj->height, FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN))
                 return false; /* read_callback_ sets the state for us */
 
         /* read depth */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &obj->depth, FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN))
                 return false; /* read_callback_ sets the state for us */
 
         /* read colors */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &obj->colors, FLAC__STREAM_METADATA_PICTURE_COLORS_LEN))
                 return false; /* read_callback_ sets the state for us */
 
         /* read data */
         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &(obj->data_length), FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN))
                 return false; /* read_callback_ sets the state for us */
-        if(0 == (obj->data = (FLAC__byte*)safe_malloc_(obj->data_length))) {
+        if(0 == (obj->data = safe_malloc_(obj->data_length))) {
                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                 return false;
         }
         if(obj->data_length > 0) {
                 if(!FLAC__bitreader_read_byte_block_aligned_no_crc(decoder->private_->input, obj->data, obj->data_length))
                         return false; /* read_callback_ sets the state for us */
         }
 
         return true;
 }
@@ skipping 53 matching lines @@
                         decoder->private_->header_warmup[0] = (FLAC__byte)x;
                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &x, 8))
                                 return false; /* read_callback_ sets the state for us */
 
                         /* we have to check if we just read two 0xff's in a row; the second may actually be the beginning of the sync code */
                         /* else we have to check if the second byte is the end of a sync code */
                         if(x == 0xff) { /* MAGIC NUMBER for the first 8 frame sync bits */
                                 decoder->private_->lookahead = (FLAC__byte)x;
                                 decoder->private_->cached = true;
                         }
-                        else if(x >> 2 == 0x3e) { /* MAGIC NUMBER for the last 6 sync bits */
+                        else if(x >> 1 == 0x7c) { /* MAGIC NUMBER for the last 6 sync bits and reserved 7th bit */
                                 decoder->private_->header_warmup[1] = (FLAC__byte)x;
                                 decoder->protected_->state = FLAC__STREAM_DECODER_READ_FRAME;
                                 return true;
                         }
                 }
                 if(first) {
                         send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC);
                         first = false;
                 }
         }
@@ skipping 675 matching lines @@
                         FLAC__ASSERT(0);
         }
 
         /* decode the subframe */
         if(do_full_decode) {
                 memcpy(decoder->private_->output[channel], subframe->warmup, sizeof(FLAC__int32) * order);
                 /*@@@@@@ technically not pessimistic enough, should be more like
                 if( (FLAC__uint64)order * ((((FLAC__uint64)1)<<bps)-1) * ((1<<subframe->qlp_coeff_precision)-1) < (((FLAC__uint64)-1) << 32) )
                 */
                 if(bps + subframe->qlp_coeff_precision + FLAC__bitmath_ilog2(order) <= 32)
-                        if(bps <= 16 && subframe->qlp_coeff_precision <= 16) {
-                                if(order <= 8)
-                                        decoder->private_->local_lpc_restore_signal_16bit_order8(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order);
-                                else
-                                        decoder->private_->local_lpc_restore_signal_16bit(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order);
-                        }
+                        if(bps <= 16 && subframe->qlp_coeff_precision <= 16)
+                                decoder->private_->local_lpc_restore_signal_16bit(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order);
                         else
                                 decoder->private_->local_lpc_restore_signal(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order);
                 else
                         decoder->private_->local_lpc_restore_signal_64bit(decoder->private_->residual[channel], decoder->private_->frame.header.blocksize-order, subframe->qlp_coeff, order, subframe->quantization_level, decoder->private_->output[channel]+order);
         }
 
         return true;
 }
 
 FLAC__bool read_subframe_verbatim_(FLAC__StreamDecoder *decoder, unsigned channel, unsigned bps, FLAC__bool do_full_decode)
@@ skipping 27 matching lines @@
         const unsigned partitions = 1u << partition_order;
         const unsigned partition_samples = partition_order > 0? decoder->private_->frame.header.blocksize >> partition_order : decoder->private_->frame.header.blocksize - predictor_order;
         const unsigned plen = is_extended? FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN : FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN;
         const unsigned pesc = is_extended? FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_ESCAPE_PARAMETER : FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER;
 
         /* sanity checks */
         if(partition_order == 0) {
                 if(decoder->private_->frame.header.blocksize < predictor_order) {
                         send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC);
                         decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
-                        return true;
+                        /* We have received a potentially malicious bit stream. All we can do is error out to avoid a heap overflow. */
+                        return false;
                 }
         }
         else {
                 if(partition_samples < predictor_order) {
                         send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC);
                         decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC;
-                        return true;
+                        /* We have received a potentially malicious bit stream. All we can do is error out to avoid a heap overflow. */
+                        return false;
                 }
         }
 
-        if(!FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(partitioned_rice_contents, max(6, partition_order))) {
+        if(!FLAC__format_entropy_coding_method_partitioned_rice_contents_ensure_size(partitioned_rice_contents, flac_max(6u, partition_order))) {
                 decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
                 return false;
         }
 
         sample = 0;
         for(partition = 0; partition < partitions; partition++) {
                 if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &rice_parameter, plen))
                         return false; /* read_callback_ sets the state for us */
                 partitioned_rice_contents->parameters[partition] = rice_parameter;
                 if(rice_parameter < pesc) {
                         partitioned_rice_contents->raw_bits[partition] = 0;
                         u = (partition_order == 0 || partition > 0)? partition_samples : partition_samples - predictor_order;
-                        if(!decoder->private_->local_bitreader_read_rice_signed_block(decoder->private_->input, residual + sample, u, rice_parameter))
+                        if(!FLAC__bitreader_read_rice_signed_block(decoder->private_->input, residual + sample, u, rice_parameter))
                                 return false; /* read_callback_ sets the state for us */
                         sample += u;
                 }
                 else {
                         if(!FLAC__bitreader_read_raw_uint32(decoder->private_->input, &rice_parameter, FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_RAW_LEN))
                                 return false; /* read_callback_ sets the state for us */
                         partitioned_rice_contents->raw_bits[partition] = rice_parameter;
                         for(u = (partition_order == 0 || partition > 0)? 0 : predictor_order; u < partition_samples; u++, sample++) {
                                 if(!FLAC__bitreader_read_raw_int32(decoder->private_->input, &i, rice_parameter))
                                         return false; /* read_callback_ sets the state for us */
@@ skipping 321 matching lines @@
                 upper_bound_sample++;
 
         decoder->private_->target_sample = target_sample;
         while(1) {
                 /* check if the bounds are still ok */
                 if (lower_bound_sample >= upper_bound_sample || lower_bound > upper_bound) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
                         return false;
                 }
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
-#if defined _MSC_VER || defined __MINGW32__
-                /* with VC++ you have to spoon feed it the casting */
-                pos = (FLAC__int64)lower_bound + (FLAC__int64)((FLAC__double)(FLAC__int64)(target_sample - lower_bound_sample) / (FLAC__double)(FLAC__int64)(upper_bound_sample - lower_bound_sample) * (FLAC__double)(FLAC__int64)(upper_bound - lower_bound)) - approx_bytes_per_frame;
-#else
                 pos = (FLAC__int64)lower_bound + (FLAC__int64)((FLAC__double)(target_sample - lower_bound_sample) / (FLAC__double)(upper_bound_sample - lower_bound_sample) * (FLAC__double)(upper_bound - lower_bound)) - approx_bytes_per_frame;
-#endif
 #else
                 /* a little less accurate: */
                 if(upper_bound - lower_bound < 0xffffffff)
                         pos = (FLAC__int64)lower_bound + (FLAC__int64)(((target_sample - lower_bound_sample) * (upper_bound - lower_bound)) / (upper_bound_sample - lower_bound_sample)) - approx_bytes_per_frame;
                 else /* @@@ WATCHOUT, ~2TB limit */
                         pos = (FLAC__int64)lower_bound + (FLAC__int64)((((target_sample - lower_bound_sample)>>8) * ((upper_bound - lower_bound)>>8)) / ((upper_bound_sample - lower_bound_sample)>>16)) - approx_bytes_per_frame;
 #endif
                 if(pos >= (FLAC__int64)upper_bound)
                         pos = (FLAC__int64)upper_bound - 1;
                 if(pos < (FLAC__int64)lower_bound)
@@ skipping 31 matching lines @@
                 this_frame_sample = decoder->private_->last_frame.header.number.sample_number;
 
                 if (0 == decoder->private_->samples_decoded || (this_frame_sample + decoder->private_->last_frame.header.blocksize >= upper_bound_sample && !first_seek)) {
                         if (pos == (FLAC__int64)lower_bound) {
                                 /* can't move back any more than the first frame, something is fatally wrong */
                                 decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
                                 return false;
                         }
                         /* our last move backwards wasn't big enough, try again */
                         approx_bytes_per_frame = approx_bytes_per_frame? approx_bytes_per_frame * 2 : 16;
-                        continue;       
+                        continue;
                 }
                 /* allow one seek over upper bound, so we can get a correct upper_bound_sample for streams with unknown total_samples */
                 first_seek = false;
-                
+
                 /* make sure we are not seeking in corrupted stream */
                 if (this_frame_sample < lower_bound_sample) {
                         decoder->protected_->state = FLAC__STREAM_DECODER_SEEK_ERROR;
                         return false;
                 }
 
                 /* we need to narrow the search */
                 if(target_sample < this_frame_sample) {
                         upper_bound_sample = this_frame_sample + decoder->private_->last_frame.header.blocksize;
 /*@@@@@@ what will decode position be if at end of stream? */
@@ skipping 19 matching lines @@
 #if FLAC__HAS_OGG
 FLAC__bool seek_to_absolute_sample_ogg_(FLAC__StreamDecoder *decoder, FLAC__uint64 stream_length, FLAC__uint64 target_sample)
 {
         FLAC__uint64 left_pos = 0, right_pos = stream_length;
         FLAC__uint64 left_sample = 0, right_sample = FLAC__stream_decoder_get_total_samples(decoder);
         FLAC__uint64 this_frame_sample = (FLAC__uint64)0 - 1;
         FLAC__uint64 pos = 0; /* only initialized to avoid compiler warning */
         FLAC__bool did_a_seek;
         unsigned iteration = 0;
 
-        /* In the first iterations, we will calculate the target byte position 
+        /* In the first iterations, we will calculate the target byte position
          * by the distance from the target sample to left_sample and
          * right_sample (let's call it "proportional search").  After that, we
          * will switch to binary search.
          */
         unsigned BINARY_SEARCH_AFTER_ITERATION = 2;
 
         /* We will switch to a linear search once our current sample is less
          * than this number of samples ahead of the target sample
          */
         static const FLAC__uint64 LINEAR_SEARCH_WITHIN_SAMPLES = FLAC__MAX_BLOCK_SIZE * 2;
 
         /* If the total number of samples is unknown, use a large value, and
          * force binary search immediately.
          */
         if(right_sample == 0) {
                 right_sample = (FLAC__uint64)(-1);
                 BINARY_SEARCH_AFTER_ITERATION = 0;
         }
 
         decoder->private_->target_sample = target_sample;
         for( ; ; iteration++) {
                 if (iteration == 0 || this_frame_sample > target_sample || target_sample - this_frame_sample > LINEAR_SEARCH_WITHIN_SAMPLES) {
                         if (iteration >= BINARY_SEARCH_AFTER_ITERATION) {
                                 pos = (right_pos + left_pos) / 2;
                         }
                         else {
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
-#if defined _MSC_VER || defined __MINGW32__
-                                /* with MSVC you have to spoon feed it the casting */
-                                pos = (FLAC__uint64)((FLAC__double)(FLAC__int64)(target_sample - left_sample) / (FLAC__double)(FLAC__int64)(right_sample - left_sample) * (FLAC__double)(FLAC__int64)(right_pos - left_pos));
-#else
                                 pos = (FLAC__uint64)((FLAC__double)(target_sample - left_sample) / (FLAC__double)(right_sample - left_sample) * (FLAC__double)(right_pos - left_pos));
-#endif
 #else
                                 /* a little less accurate: */
                                 if ((target_sample-left_sample <= 0xffffffff) && (right_pos-left_pos <= 0xffffffff))
                                         pos = (FLAC__int64)(((target_sample-left_sample) * (right_pos-left_pos)) / (right_sample-left_sample));
                                 else /* @@@ WATCHOUT, ~2TB limit */
                                         pos = (FLAC__int64)((((target_sample-left_sample)>>8) * ((right_pos-left_pos)>>8)) / ((right_sample-left_sample)>>16));
 #endif
                                 /* @@@ TODO: might want to limit pos to some distance
                                  * before EOF, to make sure we land before the last frame,
                                  * thereby getting a this_frame_sample and so having a better
@@ skipping 96 matching lines @@
         else
                 return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
 }
 
 FLAC__StreamDecoderSeekStatus file_seek_callback_(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data)
 {
         (void)client_data;
 
         if(decoder->private_->file == stdin)
                 return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
-        else if(fseeko(decoder->private_->file, (off_t)absolute_byte_offset, SEEK_SET) < 0)
+        else if(fseeko(decoder->private_->file, (FLAC__off_t)absolute_byte_offset, SEEK_SET) < 0)
                 return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
         else
                 return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
 }
 
 FLAC__StreamDecoderTellStatus file_tell_callback_(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
 {
-        off_t pos;
+        FLAC__off_t pos;
         (void)client_data;
 
         if(decoder->private_->file == stdin)
                 return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
         else if((pos = ftello(decoder->private_->file)) < 0)
                 return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
         else {
                 *absolute_byte_offset = (FLAC__uint64)pos;
                 return FLAC__STREAM_DECODER_TELL_STATUS_OK;
         }
 }
 
 FLAC__StreamDecoderLengthStatus file_length_callback_(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
 {
-        struct stat filestats;
+        struct flac_stat_s filestats;
         (void)client_data;
 
         if(decoder->private_->file == stdin)
                 return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
-        else if(fstat(fileno(decoder->private_->file), &filestats) != 0)
+        else if(flac_fstat(fileno(decoder->private_->file), &filestats) != 0)
                 return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR;
         else {
                 *stream_length = (FLAC__uint64)filestats.st_size;
                 return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
         }
 }
 
 FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *decoder, void *client_data)
 {
         (void)client_data;
 
         return feof(decoder->private_->file)? true : false;
 }