From patchwork Sun Feb 23 23:41:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 17885 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 A29954488C6 for ; Mon, 24 Feb 2020 01:48:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FBA768B514; Mon, 24 Feb 2020 01:48:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3DE768B509 for ; Mon, 24 Feb 2020 01:48:25 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id s10so7222782wmh.3 for ; Sun, 23 Feb 2020 15:48:25 -0800 (PST) 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=BaCTuicKdV2L//4yapJ2vZsVqsOYD+JVHZmCGisTc0k=; b=X13j/Plm8aYxNkxUWCvDNqnyunHej7/5Ae4QAyhvO/LandIdScruDE7LxcpzVYSSm3 uw/aIlWg5Dor2wFgnd1XR7N4DjeFC02AHgR3LKNUbqygMZxvPCJoC8lSSNSuzyNDaDM0 fMtTOfbi+s1V4OfYjp4GR6jf8bt9fScTNg0lxJpgWGf/o8AOogYIdok/expQosDfq8LN 9qVzi3Iwk53xATbzFapTKM7SDpYzS9s4sDpI7+olJEJAAxSkDpEIv61GPkeCh5YreWJI MUAJFwwEYSz3bVKcphDKXq7ye3nplbPMPEfFxep1Fu2PDFK8Yf8xOng4OmuVCi2cDfzC gXbw== 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=BaCTuicKdV2L//4yapJ2vZsVqsOYD+JVHZmCGisTc0k=; b=s5LgDIpYclkpzyqTObFnevWrmbHNnl5iEvkPZurizn53KGXJPlmSJeLL7Eq1YHB8RX 9EnMGxvC+iTicJClF/68Rk98148kqPTYsJPtwIJXe45U+sKwppJhJ+1sdg6qvz8naoWx UuF8cs4L8chZFHFN0xBcvjlySwtJxD2hPJITZ30h45jm6QS/m2RahU3wMurzSun+iCwg t8WNbaFncyCVMLUU88Y6ENaiJOFZQYNbcY165XsAzR+C0g9ujGoepBNVL6eNLc2/QNyr qnxR7skMyZ2vIUoYQjXdPyANeLA88ue2NGw3Kx7BeR/W2AYfqz9g8s6Jo1PR4u68ziej XdUQ== X-Gm-Message-State: APjAAAW+YVXzXy9+8zjcxXkmf5IMA2u/i4ukol3nUpkVdDsr8tCQj1yr YpMcRPpjdDB9fAKjj8pguS0VHUuRsXk= X-Google-Smtp-Source: APXvYqx7oC6A5YnwnD0c1pFu2AIkhYtK9+1dlZtstMW66G/nqcGUtv2zN95YXQqGZjmg2F/BS7VMtw== X-Received: by 2002:a1c:a752:: with SMTP id q79mr17313990wme.64.1582501299815; Sun, 23 Feb 2020 15:41:39 -0800 (PST) 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 y131sm16358070wmc.13.2020.02.23.15.41.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2020 15:41:39 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Feb 2020 23:41:10 +0000 Message-Id: <20200223234124.17689-7-sw@jkqxz.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200223234124.17689-1-sw@jkqxz.net> References: <20200223234124.17689-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 07/21] 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 7e2cd4b00c..84cb70b863 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; \