[FFmpeg-devel] [PATCH 6/6] avformat/dhav: Check amount read

From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 6/6] avformat/dhav: Check amount read
Date: Wed, 22 May 2024 07:08:34 +0200
Message-ID: <GV1P250MB07377C7D6262EA35B7F144A38FEB2@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <GV1P250MB0737573F097D7A823FE23B2A8FEB2@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>

Prevents potential use of uninitialized data in the following
memcmp().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/dhav.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/dhav.c b/libavformat/dhav.c
index 8e08274e68..b2ead99609 100644
--- a/libavformat/dhav.c
+++ b/libavformat/dhav.c
@@ -278,7 +278,9 @@ static int dhav_read_header(AVFormatContext *s)
     if (ret < 0)
         return ret;
 
-    avio_read(s->pb, signature, sizeof(signature));
+    ret = ffio_read_size(s->pb, signature, sizeof(signature));
+    if (ret < 0)
+        return ret;
     if (!memcmp(signature, "DAHUA", 5)) {
         avio_skip(s->pb, 0x400 - 5);
         dhav->last_good_pos = avio_tell(s->pb);
-- 
2.40.1

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

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
