From patchwork Sun May 3 22:05:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 19461 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 F3EC744B916 for ; Mon, 4 May 2020 01:06:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D512668C147; Mon, 4 May 2020 01:06:07 +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 8716D68C0CB for ; Mon, 4 May 2020 01:05:58 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id g13so18643166wrb.8 for ; Sun, 03 May 2020 15:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=5BBBBGbBaNllygcc6HNTRmpaYFdD8YLFTCwDpj47Bjg=; b=RcPgScEgDcsY0lYmLtCUmrpOP69ZlWgiU54AdErls3eKryGT9ulBrmGCgJU8QYoiTb pTH2PMmoRKximVMJLfLrW8IihkGlK27bL6suoWA10xZDVsujpAxgqa9Us+yQixoHbtF/ VCBeNQuOAVIKV43NqRTikZC9TyGEvZbOM4eAk8Fjm2siTUbH0b19tXjl6FGeVZXfzuPP LEhE4APO0DmLsTZYCgWVsHwRPpcPe+JZGdTqbZCa4qzr5gGfvb87LKwpWp3cLXyYrDRX YtIHTxvqHHA9KyH56K/XYFoF5PY0pJSlVG8X1lmtAdprJjBLX4OPfpEdAGFzZ9R8Buq1 O/uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5BBBBGbBaNllygcc6HNTRmpaYFdD8YLFTCwDpj47Bjg=; b=H45l7ZA0NV66ZeArj+Oum3cPd2u3krb595T1WioN1Upi0jOiSS0cGjnkMdrreLLBi5 zzaGc7VY7QB8J6sTkVFV0RzCdshjQ/C+ECckdbcyOr33Mbr9DMdrEBRRUxXz5esgf9G8 K0fW5kVsZ++gMB8LYz7y8SzCY/5rMDM8nxR4VIURejTusOA2xolpqZZ8mNjZLI2HdHp2 U78sKJnfa2nYORJI3ohlgZFjR4VpFxOVUqMDW3g/uS/OUHtUQm6FviPm8xR5PPgfu2wM A3p1hIdoxWYrKQFpSk0s9yHE37crxsNHorD8o3I7yl4J+W8Pk+WkTGI85lMP5x/GDCS1 Pz5A== X-Gm-Message-State: AGi0PuY0hu7LL/jnq3UmiJfdOlJXJhZ2b9dc17P4p7fG2Mjpxb674ojZ YNXVh/HbzrgnoRhOh7N8HbWxfjxGaFY= X-Google-Smtp-Source: APiQypKWJ4HNmrNGsXEzWCpc1vbziaUMZ8QP6YqyGruBrg2DNSNRpCYbfY9e2zOFNJniDI3ikRvklA== X-Received: by 2002:a5d:4211:: with SMTP id n17mr14918562wrq.286.1588543557622; Sun, 03 May 2020 15:05:57 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id a24sm10307285wmb.24.2020.05.03.15.05.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 15:05:56 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 May 2020 23:05:33 +0100 Message-Id: <20200503220548.23543-7-sw@jkqxz.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200503220548.23543-1-sw@jkqxz.net> References: <20200503220548.23543-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 07/22] cbs_h2645: Ensure that non-refcounted parameter sets are fully copied 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" Only copying the main structure is not necessarily sufficient - there could be references to substructures. --- libavcodec/cbs_h2645.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index b5a033dcbd..e4fbd8e633 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -708,18 +708,20 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \ CodedBitstreamH26 ## h26n ## Context *priv = ctx->priv_data; \ H26 ## h26n ## Raw ## ps_name *ps_var = unit->content; \ unsigned int id = ps_var->id_element; \ + int err; \ if (id >= FF_ARRAY_ELEMS(priv->ps_var)) { \ av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid " #ps_name \ " id : %d.\n", id); \ return AVERROR_INVALIDDATA; \ } \ + err = ff_cbs_make_unit_refcounted(ctx, unit); \ + if (err < 0) \ + return err; \ if (priv->ps_var[id] == priv->active_ ## ps_var) \ priv->active_ ## ps_var = NULL ; \ av_buffer_unref(&priv->ps_var ## _ref[id]); \ - if (unit->content_ref) \ - priv->ps_var ## _ref[id] = av_buffer_ref(unit->content_ref); \ - else \ - priv->ps_var ## _ref[id] = av_buffer_alloc(sizeof(*ps_var)); \ + av_assert0(unit->content_ref); \ + priv->ps_var ## _ref[id] = av_buffer_ref(unit->content_ref); \ if (!priv->ps_var ## _ref[id]) \ return AVERROR(ENOMEM); \ priv->ps_var[id] = (H26 ## h26n ## Raw ## ps_name *)priv->ps_var ## _ref[id]->data; \