From patchwork Sun Sep 13 02:57: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: 22316 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 82BF1449E91 for ; Sun, 13 Sep 2020 05:58:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6423168BBBF; Sun, 13 Sep 2020 05:58:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5390868BBB5 for ; Sun, 13 Sep 2020 05:58:28 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id e17so7622787wme.0 for ; Sat, 12 Sep 2020 19:58:28 -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=+kP5fcg48ZlIh3GuMY6acGIAADxSQENuaviqky/pk3Q=; b=OMMN8SAkYcrcgzox4a1BBir62j4/aU+LNtgYLVojDulwOu2JmlXEsLF3z/HIl+VKmG 0TY2bc544XcHPlVDQp7vuowY0l6GgB45JwRkTmCyTVTfvwDtmI7izIcCw03dXTIpbKtY HdcKZvqKE31qVrb6NXhOvhAytP/SNLaxaw9ixlukyABjexRBNe/04zWaHXNt3S2ip2hz FzbJ8JkSSXqSqNJy/hZxFMLLrxYujFUGTEhaBX7wZ4hH2HEFe3gIkmakcqrQEXD3PHSW GiwnS4hrp+1ZGFuLg3lz4dQ+C5nzuKLNA0AuPmuvyD5N+WhYasfiRagaU1P+Fw7N+yMN rGCw== 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=+kP5fcg48ZlIh3GuMY6acGIAADxSQENuaviqky/pk3Q=; b=SV3P9wCnM0EMh50B+hPmNKT+0cKqOzZcO1/WakLx/WsJxMUvc3Ft7QygHiJuAHA22t ow1gEpTaXmhQqzW9C20dWMC6caQ+2CgL+QlUwM5W7VWVems2qmjfzwq/x6wAJaHRL5M5 8jpVetbbNUVlhOdHZhwm6e367GeC6HUXl50sOpxFuLWH7E1Dlxkxai4XFsVvn6GMtCmy b0uPMoIvwLTKlk3OZ4na83Tg1E5Q84QzZLqFR6x+Wj9cKGajCB4Yo9rEkb2zWmckCYjZ q5c816upC93ASxSvl0iQ86Dyrw54Bj4jYH3Zf0U7pdA3lApv/WiIpTC7DOk0mKKB8hpF TlOQ== X-Gm-Message-State: AOAM531xS+adgTKhh73uzvhW8ZwpaoRCTR15uGKt6MrsvLTv0QEGuN2u 7GiDTcFOtP1vvFQw9C1eORJ20V5q6oI= X-Google-Smtp-Source: ABdhPJw683tvQhmngM7Kjzs+XBi7M8ONn5VRtLMWxq93JU7m3ku8zKdEPAAE6EVGDScFilNsverCxA== X-Received: by 2002:a1c:6346:: with SMTP id x67mr8817319wmb.42.1599965907462; Sat, 12 Sep 2020 19:58:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id f3sm11883355wmb.35.2020.09.12.19.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Sep 2020 19:58:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 04:57:46 +0200 Message-Id: <20200913025753.274772-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> References: <20200913025753.274772-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/16] avcodec/sonic: Fix leaks upon allocation errors 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" The Sonic decoder and encoders allocate several buffers in their init function and return immediately if one of these allocations fails; this will lead to leaks if there was an earlier successfull allocation. Fix this by setting the FF_CODEC_CAP_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavcodec/sonic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c index ea6ef10c9e..fa4ecc3a7a 100644 --- a/libavcodec/sonic.c +++ b/libavcodec/sonic.c @@ -1095,6 +1095,7 @@ AVCodec ff_sonic_decoder = { .close = sonic_decode_close, .decode = sonic_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_EXPERIMENTAL, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif /* CONFIG_SONIC_DECODER */ @@ -1109,6 +1110,7 @@ AVCodec ff_sonic_encoder = { .encode2 = sonic_encode_frame, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .capabilities = AV_CODEC_CAP_EXPERIMENTAL, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .close = sonic_encode_close, }; #endif @@ -1124,6 +1126,7 @@ AVCodec ff_sonic_ls_encoder = { .encode2 = sonic_encode_frame, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .capabilities = AV_CODEC_CAP_EXPERIMENTAL, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, .close = sonic_encode_close, }; #endif