From patchwork Thu Jun 11 16:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20286 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 E69F3449B85 for ; Thu, 11 Jun 2020 19:14:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D49D168B575; Thu, 11 Jun 2020 19:14:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F17468AEAD for ; Thu, 11 Jun 2020 19:13:56 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id z1so4980746qtn.2 for ; Thu, 11 Jun 2020 09:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=U7Miuj7a8e/Fv0JJ28Zcg3/CqTvSrAa1u0AeqZFu3bg=; b=lszSsaZR24T+SRKfgAn5ZZrJFqpnVqy5D7wyLSbDE6fuVejFiN2bND217mEJVDGS6Z J4ar1VZpeltJDQZ4S5D0s9Tlvlt1g9n2DmgZG1WIxmN+JlN8D9FEwi6t3hcmQ30o+lQO PtLaJdAa7qdFyi7wZYXfuynXBtL4PmQqhCjOQnpb8vzGi3u2nPcx0g+nXLJzXc8I9hw1 ihw4tPSfMr2S18fS6fAVS4wkPmW+dt3NrGl+SMjCLe0G2YxMNQyPVW1Whq4mhA0ndnQ9 cfVvV1owW9KzlQODa+ypooh3TJqdX9G8mAsipkl6R+eAgxoE8yTR8OL4XZCVVQScHeyo hhmA== 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=U7Miuj7a8e/Fv0JJ28Zcg3/CqTvSrAa1u0AeqZFu3bg=; b=q2kg+LAhpTQWY/8C48OvH41guooGIL6eNhFBbHXR1aRPZ9kMbx7Oe7qn/0IwqTREHE icOk0eKzHZtViHpweFq3IQlP+q6CkPt9eSf8oOn94KQ0HBRH4LDomknFn+LeJZac5e/q LLkEu0+UW+cDzCi5DcMSPguQl0R25/jYvHqvAnW5Dfi8lcHFp0VdSNrfrbc7D+bsh6Fo +kt/PpUmiWnDwURIJar2UB7UsTlUuoe/vSwI9rZpow+QxnPK60vGmZ7NRniRWE7FLq6f 2+N6rE7/7eyeCwpmez4nlGxL9D8PGd9D24OkEtvU2t+bytJLVmh2iP6wRFc7c3/jCKgY D45Q== X-Gm-Message-State: AOAM530LjuC7+/cKI1czTbFHyXE4VKlNRpri+qZVWhn2ftut802u1xOJ 3L/10JuxWPrzunHalaBHRFFikvNg X-Google-Smtp-Source: ABdhPJz3unAQhNcTvmKJ9me9k4DG+kKLiyvxbCXWQ4VYAcJHcDI52mpId2J8bxMv5sYi5Z4trBm7LA== X-Received: by 2002:ac8:4cce:: with SMTP id l14mr9646357qtv.35.1591892034509; Thu, 11 Jun 2020 09:13:54 -0700 (PDT) Received: from localhost.localdomain ([191.84.253.97]) by smtp.gmail.com with ESMTPSA id c17sm2603942qtw.48.2020.06.11.09.13.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:13:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Jun 2020 13:13:19 -0300 Message-Id: <20200611161320.5136-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200607132737.1375-1-jamrial@gmail.com> References: <20200607132737.1375-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/cbs_h2645: abort when the written inferred value is not the expected one 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" If this happens, it's a sign of parsing issues earlier in the process, or misuse by the calling module. Prevents creating invalid bitstreams. Signed-off-by: James Almer --- libavcodec/cbs_h2645.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 69ed890c63..f239d52271 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -408,10 +408,11 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #define infer(name, value) do { \ if (current->name != (value)) { \ - av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \ + av_log(ctx->log_ctx, AV_LOG_ERROR, \ "%s does not match inferred value: " \ "%"PRId64", but should be %"PRId64".\n", \ #name, (int64_t)current->name, (int64_t)(value)); \ + return AVERROR_BUG; \ } \ } while (0)