From patchwork Thu Jun 11 16:13:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20287 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 0B88A449B85 for ; Thu, 11 Jun 2020 19:14:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E870C68B5E6; Thu, 11 Jun 2020 19:14:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 026C068B5D7 for ; Thu, 11 Jun 2020 19:13:58 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id n11so6080121qkn.8 for ; Thu, 11 Jun 2020 09:13:57 -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=rj7+8rtCJFDDDAhOnua3252mjUlEn5KWucpfKQSU4CA=; b=M4H5FZDMsL4FCyQoObR8SSoulWGC+R00h78hXVCGTDz74qJLNoWjOO6l3WrJsTnlbZ Y8fW+eVzKu3H8OOo1kuMAAKFcKHQZLM5VsnVYKMG3K0o+0Oxa8xUd8xn7CF4gNeXzMIJ KIsQ473g8/CT+8GoZWTExnv29f9D9tthv8qW2XhVpgeKuV1AllB2s5JYLUHBlVrx/hYt RSKOAnJK9ZKTpkx2wrlCgdY69w0ccsEa7gS6f00ra46apf+rxuocwe0+/TDTFs0C1LRs EohPvE8XtSbX08zkiWqh+a4NHZ1zkhwxMx09GsH7vYNFd7aVZn/CXXcmyFvgSzNXCSRS cdPQ== 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=rj7+8rtCJFDDDAhOnua3252mjUlEn5KWucpfKQSU4CA=; b=Zjp5LPMfUgXTqdlYdRDCcWhXIdFvtIhdgK5q4iVURc3gY0fQMY2OmLeUZTOqnh7hCh WW/FBwcj8AhXzYSkYztT6jcDopDHvKP/G3qS1GCh1ue0qIEnq3m23AXsT92l4vE2pV6J UySoxH1V/BOfmSIDgbgLViNZB3O3RBVs6qgxpO0/iyo35YjBxg2keQInh9cz9fNhtA/k rfzu0e561xbCHGKOOfsXdGP59pVF01maXRftMVLbXU9BYZL56d0jw9QGqxZDolo6l163 CMYQACpW+uBvfQwH5AdaV2U2m0xFjqbKrTukad6UfH1EMOQyLANslmqSM46JJL9TbFj2 LmBQ== X-Gm-Message-State: AOAM533KxGgJDipgMe3QS8I5n5rozsv5Ipxf5KYPtHrXwuVqUvuWXcR7 LqrsbGIhHI0T6qHJNsI27ou4f6CH X-Google-Smtp-Source: ABdhPJxAVxKrehDatBIBAarkr/hZGGEKIzuZCJUQHFH4GLs3VOWAkAwYwklv47EBORd+AX0lkta69A== X-Received: by 2002:a37:784:: with SMTP id 126mr8872029qkh.200.1591892036173; Thu, 11 Jun 2020 09:13:56 -0700 (PDT) Received: from localhost.localdomain ([191.84.253.97]) by smtp.gmail.com with ESMTPSA id c17sm2603942qtw.48.2020.06.11.09.13.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:13:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Jun 2020 13:13:20 -0300 Message-Id: <20200611161320.5136-2-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200611161320.5136-1-jamrial@gmail.com> References: <20200607132737.1375-1-jamrial@gmail.com> <20200611161320.5136-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/cbs_av1: 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_av1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index fc228086c2..456bd9b1d5 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -711,10 +711,11 @@ static size_t cbs_av1_get_payload_bytes_left(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)