comparison c93.c @ 5181:c900e8690782 libavformat

Check the index validity more thoroughly for the c93 probe function. In particular, check that length of the first index entries is not 0 since that is interpreted "end of file" and makes no sense in the very first entries.

5180:a026efc0ca86

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

#include "avformat.h"
#include "voc.h"

typedef struct {
    uint16_t index;
    uint8_t length;
    uint8_t frames;

    AVStream *audio;
} C93DemuxContext;

static int probe(AVProbeData *p)
{
    if (p->buf[0] == 0x01 && p->buf[1] == 0x00 &&
        p->buf[4] == 0x01 + p->buf[2] &&
        p->buf[8] == p->buf[4] + p->buf[6] &&
        p->buf[12] == p->buf[8] + p->buf[10])
        return AVPROBE_SCORE_MAX;

    return 0;
}

static int read_header(AVFormatContext *s,
                           AVFormatParameters *ap)
{

5181:c900e8690782

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

#include "avformat.h"
#include "voc.h"
#include "libavutil/intreadwrite.h"

typedef struct {
    uint16_t index;
    uint8_t length;
    uint8_t frames;

    AVStream *audio;
} C93DemuxContext;

static int probe(AVProbeData *p)
{
    int i;
    int index = 1;
    if (p->buf_size < 16)
        return 0;
    for (i = 0; i < 16; i += 4) {
        if (AV_RL16(p->buf + i) != index || !p->buf[i + 2] || !p->buf[i + 3])
            return 0;
        index += p->buf[i + 2];
    }
    return AVPROBE_SCORE_MAX;
}

static int read_header(AVFormatContext *s,
                           AVFormatParameters *ap)
{