From patchwork Tue Apr 28 08:36:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19303 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 E5E9E44B819 for ; Tue, 28 Apr 2020 11:40:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBE0B68BE1B; Tue, 28 Apr 2020 11:40:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8A0F68BE09 for ; Tue, 28 Apr 2020 11:40:13 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id g13so23609963wrb.8 for ; Tue, 28 Apr 2020 01:40:13 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=PPxAj4wtIxs6GppaBffQ3A4cV1ykZsmvXYUdhBQDXFU=; b=WLfH0qPomxH1n0+JgMhrNqx3XZNvuOoUIiO7D4Od2MXrqO5d5i/myJ0gQsc7c+BjWQ T3wZADhWsNCSRvf3u+am06E886wGmH5Mt9ZK/fREOF7tdXCQtUd/cFiiv+G4uPxMAc0l 9jI6XomLFbq7h9DKY0DGG6rwtaFbO56Oejmx4cr6ou6tBV7wOsDK1fSnI11yv0BazKi9 GeW/NJ2dAUjJUjazR0lT7RThcukG1+1KdP2MmhwOyFJbKuEOVW/Hv31jPHUFuR1ftBL/ bhGBSKIHOvleCY6Zxt1pJMmwYStH6ui4/T1olrD9Kd7AUEHYx1lePSgj2xqS2Eu3a+88 Fr5w== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PPxAj4wtIxs6GppaBffQ3A4cV1ykZsmvXYUdhBQDXFU=; b=caQ0bHG36MuhUrhDV9cFAPkZh4hVi2SNhJ53JXzBw+KZNuquMdoh4HkCSnqV8kbrHd +rHdlH7bc5Hh13kLwcw/4yt00CD8XqMB/ySV6oUbllPE9kz4ea3KFiUXHEJo6LWm1hxT EU/mj8od4f9dsdxuMckENQuOopuIiwFk6rBaltwBvP8SGujyMc6jB8kLSIMHhsLpqn4b cQxtsj7NMVlI+z7iB9NTNrUgdwyhMN0mlzNCWgV/qj44q8JJiWKvgXYggwBX0Wu/CgND g9S5B9koFvMvXZU/wfDRKLSe7D72WkuEHGeLWULGgpAAh9bHclEGHYPWD59HV6xhSnej 2gDA== X-Gm-Message-State: AGi0PuYn+Llw6ED3gFjHqS2CSP/mgr+ZSj/kSxmHTUqUw0sMkWAo760u sh5GCiuNBVpIg6z2vIgPWjt1SwgS X-Google-Smtp-Source: APiQypKO4OWlbjAy9/cpTPFnvYHY5/ZW7La+udvXeNUqx9u1wQUXKl1vYKUVSkpFgZoPP5DrxwgyBw== X-Received: by 2002:adf:d091:: with SMTP id y17mr31044011wrh.418.1588063208714; Tue, 28 Apr 2020 01:40:08 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id w11sm2258351wmi.32.2020.04.28.01.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2020 01:40:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Apr 2020 10:36:44 +0200 Message-Id: <20200428083645.4909-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200428083645.4909-1-andreas.rheinhardt@gmail.com> References: <20200428083645.4909-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/7] avformat/matroskaenc: Fix memleak upon encountering bogus chapter 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" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 668b18e9ee..09f08c1e9f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1463,6 +1463,7 @@ static int mkv_write_chapters(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n", chapterstart, chapterend); + ffio_free_dyn_buf(&dyn_cp); return AVERROR_INVALIDDATA; }