From patchwork Sat Sep 26 10:27:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22613 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 8020144A10F for ; Sat, 26 Sep 2020 13:30:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69D6268B826; Sat, 26 Sep 2020 13:30:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC58668B767 for ; Sat, 26 Sep 2020 13:30:15 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id k10so3505299wru.6 for ; Sat, 26 Sep 2020 03:30:15 -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=/PfddM8Hcw3k+Xppy7/ve7fY5wW4G/cYoIEV1Mb8f00=; b=a0Ls2UgB6U574jf/eFBNt9NfzUTWJx+xrp6iNlFX4Ou47BhR7BDQ25tL075gkRp0d3 t2hgvDxOk0GaXZIKBmMCdRkH6koXTT1fBmxdpC147WPELM6S0SLWtCScLewMZCTryFzj /hlY2ZkvyUnygZZVOAJzbI5jX9XEFQMORCHEUjv7QGgeitqcrEM0rxuGwBDRh3e6OQT1 fkCe1mUtx+bju0QYKaG4Xz59p1y2oa21TusRO8mPTOecWNxp2EQc2Pc1oSZEurfMFn0J 00GstrX4UTnK4VNsrUmMW6cKegYc97jyQgkf3i3ygVoMJzm2cNlI2sZ0Om9FDDgGbADn rGBg== 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=/PfddM8Hcw3k+Xppy7/ve7fY5wW4G/cYoIEV1Mb8f00=; b=MNgek13vGYKCLH3K/xuln+LTCSFSFv4DXF8Ox4fwY/bxQxbOqm01SPqleGySDXhnvx pWGEYfHekP6Tmyp9DeM9X/k21Eztlh2hJzp76KgsSJAuJnX+FmQOLSw1nMFVU3eKk5O2 0xTBLO86mpeoWUiF1mRJXnYOGsT6BfeUfzWhDwQg2y+D/vf1TX41NFCBeEjAqf2PxWG3 Cv02UdNZQ/B8FXFT/Wdr0p9gGeEetqPVzhA6F5yajBpTJZWsDQNi503Kha5nE3+Yg7Mn wA+gQV8JtmvRKqK94uHY/HIfJBDE2pQqRiqsV1Paq8OzGX7btdQI8b19nf7lMmiqAhzo xL1w== X-Gm-Message-State: AOAM530qWn/05Bo7UeWxVUXUr8nwWgK58ZSumao0UOtQNAhMwWgIG1tH I31lkgYy9AUYwEfesr1U4ob1+vcP0gI= X-Google-Smtp-Source: ABdhPJw3/mqBdbYQ70r5MwSM2eUbeqzCnwNsxw8vU3427kLYcCVFXI81Vq0/SWL/JiHVuKb+EDtCmg== X-Received: by 2002:adf:ed12:: with SMTP id a18mr9450062wro.178.1601116214708; Sat, 26 Sep 2020 03:30:14 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k8sm6064867wrl.42.2020.09.26.03.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Sep 2020 03:30:14 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Sep 2020 12:27:59 +0200 Message-Id: <20200926102804.228089-20-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> References: <20200926102804.228089-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/25] avcodec/utils: Improve check for freeing codec private options 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" Don't check for AVCodec.priv_data_size (which is always true if AVCodec.priv_class is set). Instead check for AVCodecContext.priv_data to actually exist. (Note: av_opt_free(NULL) is a no-op.) Signed-off-by: Andreas Rheinhardt --- libavcodec/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8e7c3125aa..a8af45d0c3 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1030,7 +1030,7 @@ free_and_end: if (HAVE_THREADS && avci->thread_ctx) ff_thread_free(avctx); - if (codec->priv_class && codec->priv_data_size) + if (codec->priv_class && avctx->priv_data) av_opt_free(avctx->priv_data); av_opt_free(avctx);