virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avformat/argo_asf: check sample count in demuxer

Browse Source 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Zane van Iperen 2020-08-02 22:22:42 +10:00
parent be090da25f
commit b0b87f28c3
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/argo_asf.c
View File

@ -27,6 +27,7 @@
#define ASF_TAG MKTAG('A', 'S', 'F', '\0') #define ASF_TAG MKTAG('A', 'S', 'F', '\0')
#define ASF_FILE_HEADER_SIZE 24 #define ASF_FILE_HEADER_SIZE 24
#define ASF_CHUNK_HEADER_SIZE 20 #define ASF_CHUNK_HEADER_SIZE 20
#define ASF_SAMPLE_COUNT 32
typedef struct ArgoASFFileHeader { typedef struct ArgoASFFileHeader {
uint32_t magic; /*< Magic Number, {'A', 'S', 'F', '\0'} */ uint32_t magic; /*< Magic Number, {'A', 'S', 'F', '\0'} */
@ -39,7 +40,7 @@ typedef struct ArgoASFFileHeader {
typedef struct ArgoASFChunkHeader { typedef struct ArgoASFChunkHeader {
uint32_t num_blocks; /*< No. blocks in the chunk. */ uint32_t num_blocks; /*< No. blocks in the chunk. */
uint32_t num_samples; /*< No. samples per channel in a block. */ uint32_t num_samples; /*< No. samples per channel in a block. Always 32. */
uint32_t unk1; /*< Unknown */ uint32_t unk1; /*< Unknown */
uint16_t sample_rate; /*< Sample rate. */ uint16_t sample_rate; /*< Sample rate. */
uint16_t unk2; /*< Unknown. */ uint16_t unk2; /*< Unknown. */
@ -158,6 +159,12 @@ static int argo_asf_read_header(AVFormatContext *s)
argo_asf_parse_chunk_header(&asf->ckhdr, buf); argo_asf_parse_chunk_header(&asf->ckhdr, buf);
if (asf->ckhdr.num_samples != ASF_SAMPLE_COUNT) {
av_log(s, AV_LOG_ERROR, "Invalid sample count. Got %u, expected %d\n",
asf->ckhdr.num_samples, ASF_SAMPLE_COUNT);
return AVERROR_INVALIDDATA;
}
if ((asf->ckhdr.flags & ASF_CF_ALWAYS1) != ASF_CF_ALWAYS1 || (asf->ckhdr.flags & ASF_CF_ALWAYS0) != 0) { if ((asf->ckhdr.flags & ASF_CF_ALWAYS1) != ASF_CF_ALWAYS1 || (asf->ckhdr.flags & ASF_CF_ALWAYS0) != 0) {
avpriv_request_sample(s, "Nonstandard flags (0x%08X)", asf->ckhdr.flags); avpriv_request_sample(s, "Nonstandard flags (0x%08X)", asf->ckhdr.flags);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;