From patchwork Sun Oct 1 18:01:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp982876pzf; Sun, 1 Oct 2023 11:01:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEt+sUsr//lEiDsJLfOnI+hwx0UOh1Vy4JNo+d/v92raqpGsGlZ7XY5zaeFUdvx5kQ3tkAa X-Received: by 2002:a17:906:3050:b0:9ad:e180:16e3 with SMTP id d16-20020a170906305000b009ade18016e3mr8242504ejd.37.1696183277981; Sun, 01 Oct 2023 11:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696183277; cv=none; d=google.com; s=arc-20160816; b=s6MeXt+VVPxHXwIlAEdOHKmamtM0WLs0lEuBq910lVyW0zque3W+FSIVOg81+0Tv2u PI2wP+PEmryTnvVm0GdZxJYUoAs9gQYFm9FblHKDMyE+4rXl6mdH9t4FSkO0x4ei8pLx HCRHrcY3uHwsfAwujBc9ALujvjvzSaX6RXwUcYYp20OYmXLFwjWlWQeWTXXCLI6HMpsc sbGE4nVmFhJgpraG/ekiwI4MHiq2Dd94p0lxqwukXzO5e8AwArFblhptPVLtKchMwjiK 1121Xdpl6/IBTfZyPG0gL16gbjh2Y17m1LiRPeVEndHHJN+Vt5Ec4G9Abe9gyQWpGWvt qwLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=8KMLG4jj5LHIaF5Yv5dAAn46HXkumGpNHJqB9hwkbiY=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=cOupvfqnWVKaaw2UBOhXL/SnGsxfylkTJXfNb/KouK/2I1mtIQxmFwBkR7/jceIWN9 9quBquCqzXEnKX9+m6lHSupaYQ0r0yHAUZlNui/PpY6rZwiQH5aRSvSzhxokl5CpsBpT CTT+rTuymVXuOCdyDH2XrAI+SEJpByWpDZuChxSec4s5xTTnGFCeK90+Z6gHb0Dbgmnp tvl7EAsSx2brkPO0yKjcZcfw0UOX9XpeiP/gzjWN5imwrQ/ncu4/6KLQ0QDalXlEYXmq ltBIV/lnPACltqLv3FDqElUOtDgYBUxgwBtbSHU/hv5lpXmz8C86KRPznG4xcY8XS0XP T/8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j25-20020a170906255900b009ad833703a0si7029269ejb.61.2023.10.01.11.01.17; Sun, 01 Oct 2023 11:01:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 58B3C68CCE8; Sun, 1 Oct 2023 21:01:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CE2168CC19 for ; Sun, 1 Oct 2023 21:01:08 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2E5A31C0002 for ; Sun, 1 Oct 2023 18:01:06 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 1 Oct 2023 20:01:06 +0200 Message-Id: <20231001180106.27631-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-Spam-Flag: yes X-Spam-Level: *************** X-GND-Spam-Score: 230 X-GND-Status: SPAM X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/h2645_parse: Avoid EAGAIN X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +KKCkEEkh6pB EAGAIN causes an assertion failure when it is returned from the decoder Fixes: Assertion consumed != (-(11)) failed at libavcodec/decode.c:462 Fixes: assertion_IOT_instruction_decode_c_462/poc Found-by: Hardik Shah of Vehere (Dawn Treaders team) Signed-off-by: Michael Niedermayer --- libavcodec/h2645_parse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h2645_parse.h b/libavcodec/h2645_parse.h index 787ce971ee4..128dea09efb 100644 --- a/libavcodec/h2645_parse.h +++ b/libavcodec/h2645_parse.h @@ -123,7 +123,7 @@ static inline int get_nalsize(int nal_length_size, const uint8_t *buf, if (*buf_index >= buf_size - nal_length_size) { // the end of the buffer is reached, refill it - return AVERROR(EAGAIN); + return AVERROR_INVALIDDATA; } for (i = 0; i < nal_length_size; i++)