comparison flacdec.c @ 9121:7f11c330c5d6 libavcodec

flacdec: When there is not enough data to read the next header block, reset the bitstream reader instead of skipping backwards.

9120:dfd80d6fabfe

 * @return non-zero if metadata is invalid
 */
static int metadata_parse(FLACContext *s)
{
    int i, metadata_last, metadata_type, metadata_size;
    int initial_pos= get_bits_count(&s->gb);

    skip_bits_long(&s->gb, 32);

    do {
        metadata_last = get_bits1(&s->gb);
        metadata_type = get_bits(&s->gb, 7);
        metadata_size = get_bits_long(&s->gb, 24);

        if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) {
            skip_bits_long(&s->gb, initial_pos - get_bits_count(&s->gb));
            break;
        }

        if (metadata_size) {
            switch (metadata_type) {

9121:7f11c330c5d6

 * @return non-zero if metadata is invalid
 */
static int metadata_parse(FLACContext *s)
{
    int i, metadata_last, metadata_type, metadata_size;

    skip_bits_long(&s->gb, 32);

    do {
        metadata_last = get_bits1(&s->gb);
        metadata_type = get_bits(&s->gb, 7);
        metadata_size = get_bits_long(&s->gb, 24);

        if (get_bits_count(&s->gb) + 8*metadata_size > s->gb.size_in_bits) {
            /* need more data. reset the bitstream reader and return. */
            init_get_bits(&s->gb, s->gb.buffer, s->gb.size_in_bits);
            break;
        }

        if (metadata_size) {
            switch (metadata_type) {