[FFmpeg-devel,03/11] avformat/matroskadec: Improve frame size parsing error messages

Submitted by Andreas Rheinhardt on Aug. 16, 2019, 3:05 a.m.

Details

Message ID 20190816030531.4775-3-andreas.rheinhardt@gmail.com
State New
Headers show

Commit Message

Andreas Rheinhardt Aug. 16, 2019, 3:05 a.m.
When parsing the sizes of the frames in a lace fails, sometimes no
error message was raised (e.g. when using xiph or fixed-size lacing).
Only EBML lacing generated error messages (which were wrongly declared
as AV_LOG_INFO), but even here not all errors resulted in an error
message. So add a generic error message to catch them all.

Moreover, if parsing one of the EBML numbers fails, ebml_read_num already
emits its own error messages, so that all that is needed is a generic error
message to indicate that this happened during parsing the sizes of the
frames in a block; in other words, the error messages specific to
parsing EBML lace numbers can be and have been removed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/matroskadec.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 5901dbd221..c9fe795dcd 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3064,11 +3064,10 @@  static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
         uint64_t num;
         uint64_t total;
         n = matroska_ebmlnum_uint(matroska, data, size, &num);
-        if (n < 0 || num > INT_MAX) {
-            av_log(matroska->ctx, AV_LOG_INFO,
-                   "EBML block data error\n");
-            return n<0 ? n : AVERROR_INVALIDDATA;
-        }
+        if (n < 0)
+            return n;
+        if (num > INT_MAX)
+            return AVERROR_INVALIDDATA;
         data += n;
         size -= n;
         total = lace_size[0] = num;
@@ -3076,11 +3075,10 @@  static int matroska_parse_laces(MatroskaDemuxContext *matroska, uint8_t **buf,
             int64_t snum;
             int r;
             r = matroska_ebmlnum_sint(matroska, data, size, &snum);
-            if (r < 0 || lace_size[n - 1] + snum > (uint64_t)INT_MAX) {
-                av_log(matroska->ctx, AV_LOG_INFO,
-                       "EBML block data error\n");
-                return r<0 ? r : AVERROR_INVALIDDATA;
-            }
+            if (r < 0)
+                return r;
+            if (lace_size[n - 1] + snum > (uint64_t)INT_MAX)
+                return AVERROR_INVALIDDATA;
             data        += r;
             size        -= r;
             lace_size[n] = lace_size[n - 1] + snum;
@@ -3591,8 +3589,10 @@  static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf
     res = matroska_parse_laces(matroska, &data, size, (flags & 0x06) >> 1,
                                &lace_size, &laces);
 
-    if (res)
+    if (res < 0) {
+        av_log(matroska->ctx, AV_LOG_ERROR, "Error parsing frame sizes.\n");
         goto end;
+    }
 
     if (track->audio.samplerate == 8000) {
         // If this is needed for more codecs, then add them here