virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/pcm-dvd: discard buffer if block size changed

Browse Source 
This prevents a potential crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-01 12:36:51 +02:00
parent 789cd1de99
commit 7c1805869d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/pcm-dvd.c
View File

@ -31,6 +31,7 @@
typedef struct PCMDVDContext { typedef struct PCMDVDContext {
uint32_t last_header; // Cached header to see if parsing is needed uint32_t last_header; // Cached header to see if parsing is needed
int block_size; // Size of a block of samples in bytes 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 samples_per_block; // Number of samples per channel per block
int groups_per_block; // Number of 20/24bit sample groups 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 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))) if ((retval = pcm_dvd_parse_header(avctx, src)))
return retval; 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; src += 3;
buf_size -= 3; buf_size -= 3;