From patchwork Wed Oct 2 04:04:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15446 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 56EA44485DC for ; Wed, 2 Oct 2019 07:17:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DE17687F95; Wed, 2 Oct 2019 07:17:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5DF6687F84 for ; Wed, 2 Oct 2019 07:17:17 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id w12so17873452wro.5 for ; Tue, 01 Oct 2019 21:17:17 -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=dKZW5jaHy6RdsFpuSccBpWa/pY6Fh8K3QZNTZAxciHs=; b=uz33lks1jrHYoOkd6ACR2qcFXGLYMF7ObOmroP+3MIhbPqkxqu4wjhVMJxme/v6aKZ Y4ENtwrt1qZYLGv798JCUkJZvU4W941hcsz+ThTt8EseYndTZVJrBS+JL2BpXoHHiTNE 5H7uTY+MJ7m4BlPuvkJ+E+gxqSucqV7EJDQFHGrNBkve6KQVkI2BRLcAA52Z/Mv63Xnx KTA64kVcnZvRKn2tzmoLFCljwqIfBGYlmubRCMZks14Yx2J5AOHzl1WV6im18ZvF8XVR HnPOBH4Nb/6o9en1YY0FuNrSajL4wTpR1FfJJcFaw0wS5urdurrWGAh5i54zrkqM0rbl R/7w== 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=dKZW5jaHy6RdsFpuSccBpWa/pY6Fh8K3QZNTZAxciHs=; b=UzCUunFBGGPdVBZ4tlNdQMpiQG4RPRJMAaUxxDzQqfmXr9k2TaP5DOavnI6AzfaTkS x/TyJlCHKcTVhjjP2noaym9kCjEyqad1ftVXzZPOcTHMwASIP3Goyp0naEfVTBO0cbKV Px6WQ2Sm08Hrhd/m/fXf/MhI3WNvB1o204gOuSNiAqDWNGd+n+XHxJMr310hFFP9XcQq aFKu00SaRV0wGUOc55kR6yKjUerhltPxvFFX3HrmWEN87DQu2/yPdKktq0mxbeW3F8Ch Bc/zBUgz3vzuYTo0q7DXYdPAEthB9i90Vq+f5XEZfM77UMPEGtWnWOjYuE94Uaa6rE6t dboQ== X-Gm-Message-State: APjAAAWN6GaV3R1I1H8OQZXadk3HeEaiyMPH4RAAAzKMfhPChrxugVZc bYey21frrV/Rt9cYOOI4PWT5XX3c X-Google-Smtp-Source: APXvYqyHvhvakFz/IguIXjEJ1Undku1TuO/kNxgQnGXCVma0HZKQlUoj8j4/UuZGtlo/21lM4IuO4A== X-Received: by 2002:adf:e94f:: with SMTP id m15mr809856wrn.225.1569989444183; Tue, 01 Oct 2019 21:10:44 -0700 (PDT) Received: from localhost.localdomain (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id g11sm5025712wmh.45.2019.10.01.21.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 21:10:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Oct 2019 06:04:11 +0200 Message-Id: <20191002040412.821-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191002040412.821-1-andreas.rheinhardt@gmail.com> References: <20191002040412.821-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/aiffenc: Fix potential memleak upon failure 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/aiffenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index dd8b8c3d01..0b837cd264 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -235,7 +235,7 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) static int aiff_write_trailer(AVFormatContext *s) { - int ret; + int ret = 0; AVIOContext *pb = s->pb; AIFFOutputContext *aiff = s->priv_data; AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar; @@ -263,7 +263,7 @@ static int aiff_write_trailer(AVFormatContext *s) /* Write ID3 tags */ if (aiff->write_id3v2) if ((ret = put_id3v2_tags(s, aiff)) < 0) - return ret; + goto free; /* File length */ file_size = avio_tell(pb); @@ -273,9 +273,10 @@ static int aiff_write_trailer(AVFormatContext *s) avio_flush(pb); } +free: ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end); - return 0; + return ret; } #define OFFSET(x) offsetof(AIFFOutputContext, x)