From patchwork Tue Sep 29 14:22:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22655 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 18B9744AA13 for ; Tue, 29 Sep 2020 17:23:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD6B468A1A7; Tue, 29 Sep 2020 17:22:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 111DC680855 for ; Tue, 29 Sep 2020 17:22:53 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id o21so3654345qtp.2 for ; Tue, 29 Sep 2020 07:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=fBn3WApOMQPLi/FWqtubbv1RFKZU8ijrdm9Ul+j+juc=; b=barf2a44XPUbM0V/yCuis3zcEciOBiCHojCllqu4gBjdBd6uUtmMahp6uKJGEdr5tc BfMJBhipbkJyebbb87Di8qLFKJR+mkueF196YZ61TFWOfFX0pN/dsj/+kFrvV2aHfK+T MH7v6blpphE+ZrWBQdosVGa0G7Pn29kOz4Vn9ndOr0T5tnTolgYBWV6YanERbPTnI/IZ 9AwpiqAec7gM0s/a9R0ZEbaqFf1td3/HK9+M+RZSjJsiu71pVMi/A3DAnr3O9Bsk8UaS u2Wuwm8xFzjx7rnVrqPuaAW0LtmwdSR9Wz9rxdqx0l5U7RgF5fyGjckeAcNJ8HcJiUV3 gZ6Q== 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:mime-version :content-transfer-encoding; bh=fBn3WApOMQPLi/FWqtubbv1RFKZU8ijrdm9Ul+j+juc=; b=LrrxfGGnRzJDsLatlkbBTXbvG1xYT54K4LmkfqiFNlVmAeaCgwZp2wcEHP5H14EHPb uEfvKUh5koL8v8HPkkvSSaWszqKbXs7GYHiAYY25ng6tVBoFSQDPLAGQvZN48xF24sqh uwYRCAmnCWTAvVwF508x9zmTox/pk4IuXkdvdmuebulFuY0bqg9l8NaiwNKztul7jU3d N5UveXPJKduTsiQs5zlmK8LT+LMB0o4r8HPb38Sux8qz1+LNQLYIoW/FcXvTGnOirx1O 48WlWEqdZ2gU4PG01nVDIuE2OlrjWxGwPK+CuAkjeLZizGMouzxg7QMYXSdLcc675k48 NqdA== X-Gm-Message-State: AOAM531opo01wIVzlqBucy/8cmfYt35KciSwaBjqTf9fZjeOCjd2kEeH P0xhBTF1YFOzyTWO5gpJmONLbXFeols= X-Google-Smtp-Source: ABdhPJyrTpY8bUauoksvQqmXmJpuUcNKYJU9NBbn6KYiKbtcpIaou21ItxDRTF4nviOmQCZO4lOqHg== X-Received: by 2002:ac8:73d0:: with SMTP id v16mr3584936qtp.196.1601389371213; Tue, 29 Sep 2020 07:22:51 -0700 (PDT) Received: from localhost.localdomain ([181.23.78.153]) by smtp.gmail.com with ESMTPSA id x59sm5402580qte.14.2020.09.29.07.22.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 07:22:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 29 Sep 2020 11:22:29 -0300 Message-Id: <20200929142230.3491-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_av1: ensure Sequence Header unit content is always reference counted 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" Prevents a NULL pointer dereference. Signed-off-by: James Almer --- libavcodec/cbs_av1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index c66757125f..aef8cf8e64 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1043,6 +1043,10 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, av_buffer_unref(&priv->sequence_header_ref); priv->sequence_header = NULL; + err = ff_cbs_make_unit_refcounted(ctx, unit); + if (err < 0) + return err; + priv->sequence_header_ref = av_buffer_ref(unit->content_ref); if (!priv->sequence_header_ref) return AVERROR(ENOMEM);