From patchwork Tue Sep 15 07:39:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22397 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 D73FB44B636 for ; Tue, 15 Sep 2020 10:40:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C19B868BC6C; Tue, 15 Sep 2020 10:40:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAAA968BC2C for ; Tue, 15 Sep 2020 10:40:42 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id w5so2149947wrp.8 for ; Tue, 15 Sep 2020 00:40:42 -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=PQY8HoAiNfkgPjxjcVL2MxqUybojBGQTAgl/L/mLmp0=; b=scL076zmo0Ec6te8E16OCeZrXgU31Frm4TEommB45RJSD/l33hvITgNst8y+2PED9J Xv0HJ0sz/gAziBRVM2gDitqgTD294F3phxrRMo9ymiJannPAXOQZgvPOYczUva+V+JVV s3syTgIhpERLRr2Y9hsJnra2Y4wtPdbNM7xC4CGdLCS90EXbv8+gMeEjA8784uif7NbY N812qlNcB/VeRQEH4hLb6Oi0ZmU7E3OoO3BL4aw4ZnURpLawbucdlvswDj0G50OPoxdW LrOksw2QxRqJsnFfCk5I97Ihp7bjhtp0fTKQLj+YZ3WeAK4d6/azD8BMspaf0GjEJHPD UdqA== 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=PQY8HoAiNfkgPjxjcVL2MxqUybojBGQTAgl/L/mLmp0=; b=GrH75cYWuBsdxxobPk6SWWpPuI6gIPDtYWMSqnnQE3+PDtXIQXUi3ixXBDhHV9JtbU zgXz30UpNtj8nlxe8SfZgodsXXRiKZkSuzLrMEpJfjDdkbnf0fD0YmmXDayveuE4BSln FnRyT6Ta6JbYQ1E/IhS6Wt8AQtk8Yis/Fl/7mAFcMama3cv0zie6qnIM5vrnuksWGvYq mML3WrRl1hZLFO5R5P9dl9glksU6cKzJE9cN5d2Fg+QmaUJlabTz1wQeNiXOveJtxvpf cLP5x8HHO8fbFXfS1vwq8UOri3IIAcT4Mc5HvWlJ2mLrpx8rzvFZCm4feh/vaGpKvKYj Sffw== X-Gm-Message-State: AOAM53164K2ySjLunJl+rkVMwzw1fT1npQLE65Gnlb+yvB0OIM3gPHYN MQJ6FXSEYuQwni3xjzoe74Lj345Uhps= X-Google-Smtp-Source: ABdhPJwCHI6y/tz6an0F7CJF/ipwk87/D1gad0QbbZloHjSkSRDZdhGiwxdAQNhD5vJSXBAN2KARew== X-Received: by 2002:a5d:6049:: with SMTP id j9mr15759387wrt.295.1600155642079; Tue, 15 Sep 2020 00:40:42 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:41 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:46 +0200 Message-Id: <20200915074000.102622-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/30] avcodec/indeo5: Fix memleaks upon allocation error 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" ff_ivi_init_planes() might error out after having allocated some arrays. Set the FF_CODEC_CAP_INIT_CLEANUP flag in order to free these arrays in this case. Signed-off-by: Andreas Rheinhardt --- libavcodec/indeo5.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 4ccdbcaf0a..ac15d31fef 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -30,6 +30,7 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" +#include "internal.h" #include "ivi.h" #include "ivi_dsp.h" #include "indeo5data.h" @@ -692,4 +693,5 @@ AVCodec ff_indeo5_decoder = { .close = ff_ivi_decode_close, .decode = ff_ivi_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };