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

mp3adu: return error instead of just consuming bad packets

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-25 12:45:39 -04:00
parent e2e6c8799b
commit 99975966c3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegaudiodec.c
View File

@ -1847,8 +1847,8 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, int *data_size,
// Discard too short frames // Discard too short frames
if (buf_size < HEADER_SIZE) { if (buf_size < HEADER_SIZE) {
*data_size = 0; av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
return buf_size; return AVERROR_INVALIDDATA;
} }
@ -1859,8 +1859,8 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, int *data_size,
header = AV_RB32(buf) | 0xffe00000; header = AV_RB32(buf) | 0xffe00000;
if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame
*data_size = 0; av_log(avctx, AV_LOG_ERROR, "Invalid frame header\n");
return buf_size; return AVERROR_INVALIDDATA;
} }
avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header); avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header);