From patchwork Fri Jun 2 23:22:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp1594830pzb; Fri, 2 Jun 2023 16:23:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6JerAnWQOPRIEiSV8lxg/TwSnCEmm2B8EWf6fqTuu0gHx6E65h9WIH3Zg+qpV+zJ2HJ/Ia X-Received: by 2002:a17:907:7ba9:b0:974:5ce6:f9f6 with SMTP id ne41-20020a1709077ba900b009745ce6f9f6mr66991ejc.10.1685748189556; Fri, 02 Jun 2023 16:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685748189; cv=none; d=google.com; s=arc-20160816; b=ArXd8t5+p8TGQvyiiJfkazcUHEAlmv/r1kYO+vRR64DU8yT6Qz2wYZ7Izsmkb6B8EB 2egl8Pf0e/tiH/QPudzUX31fJP+NWK8oq8d3ZdV/h+9xgBz11vkeH94FbiAdkamATZJS b8x+lmlZ80T6YQdya2Nx+ekQ1NaEiTW+eaG6L2IP8UELT0pNK4JVSa2bxzxovqTha0EQ VLUGbrwhwE9deIFzlsx5C7WKfvcdK+rabqA6Rj6FQeItEYuYEp6Gygm+JTTkzdjha4R+ GKzIEbGdzsIEGYlNe7UasDNA/sH7BP7uj189xr52ThRrV4fFcmKqIj1HETuxa98UW00U EHLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=QUMMCqYuM2LRlgJaQydRp+H4t4YUAlXbzOA9MU9OjeM=; b=o3ZZXrPFUkRjyvdTPUoTCsef8a/yXa2Nr0iAum6EAg4AQy++0/29WApvz3ZK2mLagb 9ChBzAUuDQWRUOx6gBzpkeyBR9ZP+YcD/N1jQwkinAUTCoJ0KJUTQ2fWRLpQMxt2sgEQ P/seI8und9MKxMFU+coAwrBuwYiTWl3VGVfpbxW3L2AA86K+Qc9sIKwJ7YpVcakDM2BG 7miDdYjgxTuwIHFs0HtiiJ3uSSwimfhxYFCS+JQZHewIUHHCOgbMrpUCSSLfcL/tOziJ wlSjnfWZNzd8Lpflhna/UqQAX5rRvMdJGotKQ5bbyjTH5ZWpLDAdgezloRhcVWXOhFVt 9MNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=qclrEBmW; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mp42-20020a1709071b2a00b0094e09630bd6si2447927ejc.773.2023.06.02.16.23.08; Fri, 02 Jun 2023 16:23:09 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=qclrEBmW; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A68868C35C; Sat, 3 Jun 2023 02:23:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96F5C68BFD2 for ; Sat, 3 Jun 2023 02:22:58 +0300 (EEST) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-39831cb47fbso2316750b6e.1 for ; Fri, 02 Jun 2023 16:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685748176; x=1688340176; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=5lycA5TFjUHTbfMv6lo0WVk+pHUaM4qQH01c3Gjfns4=; b=qclrEBmWvAPEbCrEmcC/kURAS6oFu5brkipAa4BF3GcvKmXfqfthcyEN3FZI+MThTc +RwqoPTQZAdYxOtQfUfUhFdlKETzsEgGU6kwjV/uwcgoxt+m2YEK0EUCdG6/UeqM1slZ kGiRdpS5HIZWTmT8WOV1FqOzI+cwlp8ySvomxuT6/atES+kVLRyZhGIKvABq5Wwiy7ro yAjNgKdTm5rR7QbTLtLscD16tvpXic7DVy3LMYjFmyoESi8V25wkt6uohnnDDjGFmaQ7 AmO+LxDlCwnBaY8XxYD5BOa8zQ+ISCq1Ab3hREC2Am7JAPvwDRyc1KvJPMo/D5Gx3Gv8 4hrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685748176; x=1688340176; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5lycA5TFjUHTbfMv6lo0WVk+pHUaM4qQH01c3Gjfns4=; b=BX/Dklq0riY1/DoTIeA4T5rzEEV3tguDtAbVl1iOV4AKGOwO1vKOeAIMa4ejwPJ81s GyMOD/tMCVgem57VdVtOiagND7zhltbfb6SIzOPoKWMX28FRg26a/Rop/fwLsyrk1wlE nMRIKGNe+UZndGWka/FpPq1WXX/yQqhcwQKhQBwZIkhKZk9RHmugtZ4XJoQAH6TAdu/8 e6WdcCjovXvjX4vXnkBEU0pgXGalqgvCVZ25PvSLvs7S/0WT9x7uEYBe6qHidtfzkgGJ 83j3h4xbWXpxiKx8QmFS6iAPxNpGgwYrlLmKYo9msRC3VQvFbPX/g7+9qdiDBaUVOt64 1rDw== X-Gm-Message-State: AC+VfDxw+LB/jvZr7L7ozWvrRHgDGpyUtGpahJPORws5DgTFWHuXhIrq Ha5Tv/8LgL5x7DFDFZ+grLSXzf+2T4Q= X-Received: by 2002:a05:6808:4d0:b0:398:43a7:e9fe with SMTP id a16-20020a05680804d000b0039843a7e9femr1378888oie.20.1685748176185; Fri, 02 Jun 2023 16:22:56 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id o203-20020acaf0d4000000b00394627263a0sm1077482oih.57.2023.06.02.16.22.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jun 2023 16:22:55 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2023 20:22:46 -0300 Message-Id: <20230602232246.2827-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/av1dec: fix EOF check in Annex-B demuxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N3GZL71p+lzE And return any packet buffered by the bsf. Signed-off-by: James Almer --- libavformat/av1dec.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 216d4e2298..842dc588ab 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -131,6 +131,8 @@ static int leb(AVIOContext *pb, uint32_t *len) { do { unsigned bits; byte = avio_r8(pb); + if (pb->eof_reached || pb->error) + return pb->error ? pb->error : AVERROR_EOF; more = byte & 0x80; bits = byte & 0x7f; if (i <= 3 || (i == 4 && bits < (1 << 4))) @@ -139,8 +141,6 @@ static int leb(AVIOContext *pb, uint32_t *len) { return AVERROR_INVALIDDATA; if (++i == 8 && more) return AVERROR_INVALIDDATA; - if (pb->eof_reached || pb->error) - return pb->error ? pb->error : AVERROR(EIO); } while (more); return i; } @@ -235,18 +235,23 @@ retry: if (!c->temporal_unit_size) { len = leb(s->pb, &c->temporal_unit_size); - if (len < 0) return AVERROR_INVALIDDATA; + if (len == AVERROR_EOF) goto end; + else if (len < 0) return len; } if (!c->frame_unit_size) { len = leb(s->pb, &c->frame_unit_size); - if (len < 0 || ((int64_t)c->frame_unit_size + len) > c->temporal_unit_size) + if (len < 0) + return len == AVERROR_EOF ? AVERROR(EIO) : len; + if (((int64_t)c->frame_unit_size + len) > c->temporal_unit_size) return AVERROR_INVALIDDATA; c->temporal_unit_size -= len; } len = leb(s->pb, &obu_unit_size); - if (len < 0 || ((int64_t)obu_unit_size + len) > c->frame_unit_size) + if (len < 0) + return len == AVERROR_EOF ? AVERROR(EIO) : len; + if (((int64_t)obu_unit_size + len) > c->frame_unit_size) return AVERROR_INVALIDDATA; ret = av_get_packet(s->pb, pkt, obu_unit_size);