diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 12:36:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-01 13:00:39 +0200 |
| commit | 7c1805869d6f8dd9292977393aa4d97417716852 (patch) | |
| tree | 0d668c5a2e382cd660fda39a045cfafff2e75f9f | |
| parent | 789cd1de99cd272c02b2d960cfa08f9ecfe981d7 (diff) | |
| download | ffmpeg-7c1805869d6f8dd9292977393aa4d97417716852.tar.gz | |
avcodec/pcm-dvd: discard buffer if block size changed
This prevents a potential crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pcm-dvd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index f3f02cf6b4..b984969280 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -31,6 +31,7 @@ typedef struct PCMDVDContext { uint32_t last_header; // Cached header to see if parsing is needed int block_size; // Size of a block of samples in bytes + int last_block_size; // Size of the last block of samples in bytes int samples_per_block; // Number of samples per channel per block int groups_per_block; // Number of 20/24bit sample groups per block uint8_t *extra_samples; // Pointer to leftover samples from a frame @@ -223,6 +224,11 @@ static int pcm_dvd_decode_frame(AVCodecContext *avctx, void *data, if ((retval = pcm_dvd_parse_header(avctx, src))) return retval; + if (s->last_block_size != s->block_size) { + av_log(avctx, AV_LOG_WARNING, "block_size has changed\n"); + s->extra_sample_count = 0; + } + s->last_block_size = s->block_size; src += 3; buf_size -= 3; |