[FFmpeg-cvslog] avformat/yuv4mpegdec: better error logging

Gyan Doshi git at videolan.org
Sun Jan 26 18:20:20 EET 2020


ffmpeg | branch: master | Gyan Doshi <ffmpeg at gyani.pro> | Sun Jan 26 21:08:30 2020 +0530| [724e6b3d63786a910188a83a0d30c67c4fb359a9] | committer: Gyan Doshi

avformat/yuv4mpegdec: better error logging

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=724e6b3d63786a910188a83a0d30c67c4fb359a9
---

 libavformat/yuv4mpegdec.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c
index eceb945bb1..d7b472e6c7 100644
--- a/libavformat/yuv4mpegdec.c
+++ b/libavformat/yuv4mpegdec.c
@@ -53,10 +53,14 @@ static int yuv4_read_header(AVFormatContext *s)
             break;
         }
     }
-    if (i == MAX_YUV4_HEADER)
-        return -1;
-    if (strncmp(header, Y4M_MAGIC, strlen(Y4M_MAGIC)))
-        return -1;
+    if (i == MAX_YUV4_HEADER) {
+        av_log(s, AV_LOG_ERROR, "Header too large.\n");
+        return AVERROR(EINVAL);
+    }
+    if (strncmp(header, Y4M_MAGIC, strlen(Y4M_MAGIC))) {
+        av_log(s, AV_LOG_ERROR, "Invalid magic number for yuv4mpeg.\n");
+        return AVERROR(EINVAL);
+    }
 
     header_end = &header[i + 1]; // Include space
     for (tokstart = &header[strlen(Y4M_MAGIC) + 1];



More information about the ffmpeg-cvslog mailing list