From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 74EF44C354 for ; Sun, 9 Nov 2025 18:52:11 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'd/jwRBBlPeE4e1DD0nwHzCQOpaMoaadHfiNuyOqyG6U=', expected b'ITxy+pX0cj9d1iHGPs/IE9XNWsWpwmr/04bOCh0h8sA=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762714321; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=d/jwRBBlPeE4e1DD0nwHzCQOpaMoaadHfiNuyOqyG6U=; b=PaminUHtf0HfeY2TGFZLV9frlM48AkvVmjEK7cDYFJ/hGdSMzQrs/eGrAHbdQorHY0Cbl dUvMoNtdmJZU8TtnQ935iGcVJjRyz3ZF90sdfSxl6JK98ftg7HX8nAU6dF7d17RfNrNkvxD OG5iXbvj2wmL0ZPm2RbGISuoKspOh9aekXNglpD3MtN7SJ9KLRbcxM3hAFyoGUKYq5GqMaP m3/Wq9yiW+fIUmttsJSl7EQfn4VbPLyjmdOXyX6VML1zwx7qd3w8Rp6whMzZ+Mrs41PEBFR g1uhGJYz8YtzyKvSgRl/AC9aX3TFJTV98Rd5ab0AlDiRVBvevKdrg+O1oDOw== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8037068FB72; Sun, 9 Nov 2025 20:52:01 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762714311; b=FwysANvOs4tQ/T1gYpyFe7rKclhgGw3zqlomun8ZhO8U9GsDfcAp3KidDwcW3136POfFU tBsCwBf7h9nIgBkTWFebumKtT5Rlrw2/wuJwMgNCYwBajYahcS3FiXv4qkmWJS8VUREt9z6 vKXyoPZ0gVniMCGNEp5FPmbzpvJE4pLXQdW+2GLGf6uJMt/4ugTiYpaOJTy1eTURipbljw7 J74RHjeFpUMC4OL4VCl2yuxxx63YkrvfauZ3BoXJjpOn4A48Fb7xvxYn9CGtZ+dH8d0+4HJ 5hjL939R830aIz1k+35bU7d2T8EkGR5MT1sJjVIG4q2h954tjAuhrg0/detw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762714311; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=t3z4YJXJkRH6gY/NGTmQ/bkDwMH/IYIzJOg2ljvytAY=; b=la//3yPokzTCv2MsPN25vRT6lg69vyOjQSlZoQzoUfbAJaNV1Mgi8ftRWDBCjZDrLxhUV rJvrdEZ53+mQpB40COBg87QunTipfM53QYkM9bVZQoAULV0180XYvuvcWG4GCWVJVPLXB0G PHHuycop2MzSH7YvZ2Phx3rChlbzPqXJTXfSAdXK8t1+TGq0vx+A6wis7eI7HWSWmbB6cPb 6C6EuYVbh8egtYNbYY5lSosYoAv1qD8tp4EXYM6ETwqxcH44YGQ/UClBYyoi8Zv95fnkyuL UOQK3BoTlfUEshLs53FJuodWJdITMZGRNLt76GhJ8yTsaT2i78fll3N0+Q+w== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762714306; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=ITxy+pX0cj9d1iHGPs/IE9XNWsWpwmr/04bOCh0h8sA=; b=kXItj9yteX+hdhHac/ih+HFMYR9TFhnWDiuAjzQTUzP7u/81z1FeLpUszBx/JfV/bE7ff rCySm6FVQi5K3lqNP9gNPlaI4iy4FxOMmW1tvOJkSqbn7qhMa0ZUcdYrYz2O5HoZsnz82xf VsTZjn4SE0teVUAMaun9O9w96YQmTiZzig/vy+ywc05XBWflP2bgHaLA504Y1b2gvZWV0/e H2E/BwTk+aw14BMInOGTpsbSNkuorz+t8iTovEVhI58xr5/1cR5zibgJdujSWmACfUXttti Z4aJsXj10yqA9gRPQ/QSFfnmkW//ACK7Y5xaQE3W+URgXIGZwng+y+BvoiWQ== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1821D68FB23 for ; Sun, 9 Nov 2025 20:51:46 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sun, 09 Nov 2025 18:51:45 -0000 Message-ID: <176271430621.25.6666731293288448218@2cb04c0e5124> Message-ID-Hash: WNC2QVCQKORFFVISQVOLCKOAR7JXLKI2 X-Message-ID-Hash: WNC2QVCQKORFFVISQVOLCKOAR7JXLKI2 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] Handle errors in ogg reinit, make sure we free private data before new (PR #20877) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: toots via ffmpeg-devel Cc: toots Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20877 opened by toots URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20877 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20877.patch >>From 389a1df1e310c7a76f857137d321d455271d5719 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Sun, 9 Nov 2025 12:49:32 -0600 Subject: [PATCH] Handle errors in ogg reinit, make sure we free private data before new init. --- libavformat/oggenc.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 5cd94b49bc..080af2295f 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -649,16 +649,27 @@ static int ogg_write_packet_internal(AVFormatContext *s, AVPacket *pkt) side_metadata = av_packet_get_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, &size); if (side_metadata && oggstream->packet_written) { - ogg_write_trailer(s); + ret = ogg_write_trailer(s); + if (ret < 0) + return ret; + ogg_deinit(s); + av_freep(&st->priv_data); av_dict_free(&st->metadata); ret = av_packet_unpack_dictionary(side_metadata, size, &st->metadata); if (ret < 0) return ret; - ogg_init(s); - ogg_write_header(s); + ret = ogg_init(s); + if (ret < 0) + return ret; + + oggstream = st->priv_data; + + ret = ogg_write_header(s); + if (ret < 0) + return ret; } oggstream->packet_written = 1; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org