Commit 99975966 authored by Justin Ruggles's avatar Justin Ruggles

mp3adu: return error instead of just consuming bad packets

parent e2e6c879
...@@ -1847,8 +1847,8 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data, int *data_size, ...@@ -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, ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment