From patchwork Mon Sep 28 17:36:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22648 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7FCD644967F for ; Mon, 28 Sep 2020 20:36:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 64CC668B73A; Mon, 28 Sep 2020 20:36:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1C5168B5C8 for ; Mon, 28 Sep 2020 20:36:52 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id z4so2294812wrr.4 for ; Mon, 28 Sep 2020 10:36:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AWbWnB1btHlW+s5dOPQRs8WlFCReYEJPek1QsKn6xA0=; b=edgznYMowLkWr3XVdSBN+pE6O1tg85NaOywFgnTH/1PUQH6AdWbb9ea7dH6Ovxs+/W ONZpGMtX0nPFXqwwMK4mSj51YtWYchrnBU8tukN5G5gTUgIA6ug8J8L8SgSl/2WqXN9a k2ZxqIoroq8KY8im9p6nR5gpIiMMgw93Xnn4OFzu4N9xEwfL8RW8t1cSbOlO073AhqIh U6kV555LZ6dzyo0tDNsGSggQOjkkjVlTBFZP0VEVwTFKWsLCvyDmvJCgGZFz/em8aoC9 nyBxVCoizkMZeVlJgfdHJBKW6XjT5wIWDhMWQ0xuwjyXkXaHiw90liw8VEwxnFzHEOj+ xp0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AWbWnB1btHlW+s5dOPQRs8WlFCReYEJPek1QsKn6xA0=; b=RzyZ96j4lVWlAxMm8dhJKfV+M2OgyM5pBAXlJo+zbFIxWXRBFBoThsk74oyfdK+gG9 e/8aNLYC4BM4Xklv3Z8Nd8bsacpY37HYnDEzspGVvHGdUx5aN12e7xYhf9JmfNZdqzKS 0cKdDrKmlH4RCXkMgfJ59FPjjeHX94fO41HQ57uMaRI204dcKl1eCgZJVVXYWcRHszX3 rgycWh756uNqjvaOcxP8LbQ8ORwibyQrAqBbzbJAxdeYUBfYTSLbwfdQTeeiTmPVlTz6 LJIPhYbg5DxyKi5k/NRZnso3hxBXdydYYTl5g4lI4sMioc0dZ+eilk8PkqdaeD5L3Ki4 cR0Q== X-Gm-Message-State: AOAM530BNdBW9UeNe+uCNfknTrTJK2GHgFoyuSFI+1KMHe9dcZ5JJx0u U1vF7fftLRWu9dvohy+Np2aLcD3mOKQ= X-Google-Smtp-Source: ABdhPJzV7wb/ZCv16zFkgNZ9fGLig/A+PCTtnDX+6RE/rqP0nR22Fc3wVzJlcq0Go4XHCcR1G6lRhA== X-Received: by 2002:a5d:6311:: with SMTP id i17mr2699453wru.243.1601314611728; Mon, 28 Sep 2020 10:36:51 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l3sm2047021wmh.27.2020.09.28.10.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 10:36:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Sep 2020 19:36:40 +0200 Message-Id: <20200928173642.701462-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/movenc: Free old vos_data before overwriting it X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Otherwise the old data leaks whenever extradata needs to be rewritten (e.g. when encoding FLAC with our encoder that sends an updated extradata packet at the end). Signed-off-by: Andreas Rheinhardt --- libavformat/movenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a90bbfa458..c53be74a64 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6978,6 +6978,7 @@ static int mov_write_trailer(AVFormatContext *s) AVCodecParameters *par = track->par; track->vos_len = par->extradata_size; + av_freep(&track->vos_data); track->vos_data = av_malloc(track->vos_len + AV_INPUT_BUFFER_PADDING_SIZE); if (!track->vos_data) return AVERROR(ENOMEM);