From patchwork Tue Feb 16 22:29:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wonkap Jang X-Patchwork-Id: 25669 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 160E044B129 for ; Wed, 17 Feb 2021 00:29:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D92DD689E47; Wed, 17 Feb 2021 00:29:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6B4C689995 for ; Wed, 17 Feb 2021 00:29:23 +0200 (EET) Received: by mail-pl1-f202.google.com with SMTP id n23so286114plx.16 for ; Tue, 16 Feb 2021 14:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to; bh=JtW03Rl57Fb5MbpaybftbdXgva4+FPKXRnGKSxgX2vM=; b=WmqXwpols2PpgVwmvU63xcbae3HfNeZ3GPFi7Trka8uFCM5PnTud1wmbWyLY2J1jnr GMzfeyDRpPLHsvPeOd+8q1rn/wiJtgTcaHVE5ZVRMNYdE3Q87a6hXC6ZI4l/f/9sKu96 2GYDz0GG3RP2HnoiGDQ4iJQsxVAAMBWOPccEwsfckPuf+dCENczFojh8HaM7XIvsTftw UDc4VS/uXS0bq77ya3ilnIVhwelFYJkmP5u04LLuetHuJ0HAV3724fhIA9eD5iNQGbHp KsI3Npeu68rXFUGTylGXLGTDS0pUFtwxy6qhTnO1T0MK83kzgvPPqtawaVpraG2e3dSR b7og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to; bh=JtW03Rl57Fb5MbpaybftbdXgva4+FPKXRnGKSxgX2vM=; b=mXg0j4SeSNXoTHIMlj0lIPQPLy+kGSUuCdPEi83lGM9fpAVbR7gBNep/TcJhEIU9yN ID6wVgkMa0NGwn5iTSMJk4p6kDpk6vn5y39zu4MifVEwjtc3/D6o4nRfaZVp5oxtC2fp cMaGYrFCrt6DyHnFEwlZm96DkO9CgWtUpA1i6LVPoAYzUE+9AWtlE1+Sj6d3bEbM+IYs HpZnuxCS+QzC73AqD1XSsa4TjjWVWlmNsx2uccECm2X7lbKEITdkmXWwNMitcGA7LNKz O9GZv7/FeR+JCMGCa0MN/S6DaUeKO15KFTbtpeyjMjMaCLsROyB26o4MEWuxEpYbMI7/ Xecg== X-Gm-Message-State: AOAM533rbh1aPIRzl6A2Icu/ljjFIOs7J7C5n/eImAcYTyqoT0Ix4o8w 4et8f/itugsXmmzs33u6rer7rMwtpQyJen3YdIBS0bmx13XS1jiNWFj9NnaLkk6BVLhE0MaEc56 F8bzFZmqUDVFDshLB6qrJsK3XJk5Wr3lch826yzBi4CRy0xvhWDeeXqEtZ36n0yg= X-Google-Smtp-Source: ABdhPJwcjcWgk91c5oZyQKZmzmRseMZORUNuFN3SOv6elQvuxd7A0Dook56G2V4hmXcuXo9MBsi19mAK0cw= X-Received: from wonkap.kir.corp.google.com ([2620:15c:17:10:ed38:67:5a63:82cb]) (user=wonkap job=sendgmr) by 2002:a63:c84f:: with SMTP id l15mr21235700pgi.170.1613514561974; Tue, 16 Feb 2021 14:29:21 -0800 (PST) Date: Tue, 16 Feb 2021 14:29:20 -0800 In-Reply-To: Message-Id: <20210216222920.3078696-1-wonkap@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.478.g8a0d178c01-goog From: Wonkap Jang To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2] avcodec/libvpxenc: fix potential memory leak. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" While parsing ref_frame_config, AVdictionary needs to be manually deallocated. --- libavcodec/libvpxenc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 284cb9a108..e71ae54f34 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1595,15 +1595,21 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, if (en) { if (avctx->codec_id == AV_CODEC_ID_VP9) { AVDictionaryEntry* en2 = NULL; - av_dict_parse_string(&ctx->vpx_ref_frame_config, en->value, "=", ":", 0); - - while ((en2 = av_dict_get(ctx->vpx_ref_frame_config, "", en2, AV_DICT_IGNORE_SUFFIX))) { - if (vpx_ref_frame_config_parse(ctx, enccfg, en2->key, en2->value, avctx->codec_id) < 0) - av_log(avctx, AV_LOG_WARNING, - "Error parsing option '%s = %s'.\n", - en2->key, en2->value); + ctx->vpx_ref_frame_config = NULL; + if (av_dict_parse_string(&ctx->vpx_ref_frame_config, en->value, "=", ":", 0) == 0) { + while ((en2 = av_dict_get(ctx->vpx_ref_frame_config, "", en2, AV_DICT_IGNORE_SUFFIX))) { + if (vpx_ref_frame_config_parse(ctx, enccfg, en2->key, en2->value, avctx->codec_id) < 0) + av_log(avctx, AV_LOG_WARNING, + "Error parsing option '%s = %s'.\n", + en2->key, en2->value); + } + } else { + av_log(avctx, AV_LOG_WARNING, + "Error in parsing ref-frame-config. \n"); } + if (ctx->vpx_ref_frame_config) + av_dict_free(&ctx->vpx_ref_frame_config); codecctl_intp(avctx, VP9E_SET_SVC_REF_FRAME_CONFIG, (int *)&ctx->ref_frame_config); } else { av_log(avctx, AV_LOG_WARNING,