[libav-devel] [PATCH 7/8] mp3adu: return error instead of just consuming bad packets

[Justin Ruggles]

---
 libavcodec/mpegaudiodec.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index d247b66..1fbc7e2 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1849,8 +1849,8 @@ static int decode_frame_adu(AVCodecContext * avctx, void 
*data, int *data_size,
 
     // Discard too short frames
     if (buf_size < HEADER_SIZE) {
-        *data_size = 0;
-        return buf_size;
+        av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+        return AVERROR_INVALIDDATA;
     }
 
 
@@ -1861,8 +1861,8 @@ static int decode_frame_adu(AVCodecContext * avctx, void 
*data, int *data_size,
     header = AV_RB32(buf) | 0xffe00000;
 
     if (ff_mpa_check_header(header) < 0) { // Bad header, discard frame
-        *data_size = 0;
-        return buf_size;
+        av_log(avctx, AV_LOG_ERROR, "Invalid frame header\n");
+        return AVERROR_INVALIDDATA;
     }
 
     avpriv_mpegaudio_decode_header((MPADecodeHeader *)s, header);
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel