Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: "Kacper Michajłow" <kasper93@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: "Kacper Michajłow" <kasper93@gmail.com>
Subject: [FFmpeg-devel] [PATCH] avformat/vqf: fix memory leak in add_metadata()
Date: Sun, 26 Jan 2025 20:40:27 +0100
Message-ID: <20250126194027.657-1-kasper93@gmail.com> (raw)

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
---
 libavformat/vqf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/vqf.c b/libavformat/vqf.c
index 58b1546f53..fbe54739cd 100644
--- a/libavformat/vqf.c
+++ b/libavformat/vqf.c
@@ -66,10 +66,10 @@ static int add_metadata(AVFormatContext *s, uint32_t tag,
         return AVERROR(ENOMEM);
 
     ret = avio_read(s->pb, buf, len);
-    if (ret < 0)
-        return ret;
-    if (len != ret)
-        return AVERROR_INVALIDDATA;
+    if (ret < 0 || ret != len) {
+        av_free(buf);
+        return ret < 0 ? ret : AVERROR_INVALIDDATA;
+    }
     buf[len] = 0;
     AV_WL32(key, tag);
     return av_dict_set(&s->metadata, key, buf, AV_DICT_DONT_STRDUP_VAL);
-- 
2.45.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".

             reply	other threads:[~2025-01-26 19:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-26 19:40 Kacper Michajłow [this message]
2025-01-29 20:21 ` Jan Ekström
2025-01-29 20:23   ` Jan Ekström

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250126194027.657-1-kasper93@gmail.com \
    --to=kasper93@gmail.com \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git