From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2CD7540B86 for ; Sun, 4 Jun 2023 02:02:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E0F768C392; Sun, 4 Jun 2023 05:02:31 +0300 (EEST) Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F2B6689C13 for ; Sun, 4 Jun 2023 05:02:25 +0300 (EEST) Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-558b83a10b4so89766eaf.3 for ; Sat, 03 Jun 2023 19:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685844143; x=1688436143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LwBBQr7uLNt7yJyg1gxEkhLj5rdpt2CGkK3Dl3QvtrQ=; b=fPZh+79PvSa1Tkfa+qEMeavemMpXupNjJ5iyXi+8KCM4k6H3zynD5GV60JnO+/oXut L9y66GR1k6WqJ47s08BnguHbg7HopyP7JDF6GDgGqiWBlcPWZqB1y7itkZH0HWRMGeen V9IMdOEWRq9j8eScsGbaE/tftTewmy0vdLLXamZlCHHl9yHie1l6SuQpJTk/5vrWVbFB 50c6DcTNs+s9PJl8c2U9rjZI2lP8pCRI3dvhA4BHLMK3KxU+fsuJI/GTIw6hClGXte5+ l3qO6Eya3Xhgx3rlb35ojOuCtemWtb++qi0+QIST0EpbOWPw9i9ScY1OjS2Yv63HdS7b bv7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685844143; x=1688436143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LwBBQr7uLNt7yJyg1gxEkhLj5rdpt2CGkK3Dl3QvtrQ=; b=SMfkkZKH0PwrfRP5LgacdXF4LWIdKQX42WpBQNmsogy+lxLGp68hUMYAvLg+nHDttv Hv4Z0Xzqu7k80yHC5bGVzdhfmM6h3SidPXLu95yvmikdhMpcHjzgpy+JXbAik/sS2WWw EHmdIL8Jl9RI7q3IRNhSySQ3R42ObsdyxSmgc+dD/rdc4Vho/6dPy+pFK5WFHJC+yl1T GWh9opfqT2EXTZSgNGaBJwgYI+5kYanlzjaq95rsbIKp49pxhtw5IF9VxpCaRv4RmvoO ISGCZUsGi4TT1ceNXRC2brDMkO/rq40mvbJD0egjHo9aA9C+9RbPSJ20m3iiUVFh6PMW pMgA== X-Gm-Message-State: AC+VfDxBwflx0JNV2AWyLggIKCQOmWUfYc3Z47H/Sr+cADxxkTuM28MM Mk2L+eQRPxh7wFGcteml24dOdWYOR/A= X-Google-Smtp-Source: ACHHUZ5DMgVLlY3aOGSZ0xR+WBZ2u+X/5/c/smPv/T6xCdcoowI5JIrdmesIMTPXfUyEKwp8j+6iFg== X-Received: by 2002:a4a:ba87:0:b0:558:b78d:8d1c with SMTP id d7-20020a4aba87000000b00558b78d8d1cmr510766oop.7.1685844143463; Sat, 03 Jun 2023 19:02:23 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x1-20020a4ad041000000b0054f6fb0ec57sm1930570oor.11.2023.06.03.19.02.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 19:02:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jun 2023 23:02:13 -0300 Message-Id: <20230604020214.1527-2-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230604020214.1527-1-jamrial@gmail.com> References: <20230604020214.1527-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/av1dec: don't return EIO when the input file is truncated 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: There was no problem reading the file, so EIO is not correct. Signed-off-by: James Almer --- libavformat/av1dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 79ad8a9411..501b0cc93f 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -134,7 +134,7 @@ static int leb(AVIOContext *pb, uint32_t *len, int eof) { if (pb->error) return pb->error; if (pb->eof_reached) - return (eof && !i) ? AVERROR_EOF : AVERROR(EIO); + return (eof && !i) ? AVERROR_EOF : AVERROR_INVALIDDATA; more = byte & 0x80; bits = byte & 0x7f; if (i <= 3 || (i == 4 && bits < (1 << 4))) @@ -231,7 +231,7 @@ static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt) retry: if (avio_feof(s->pb)) { if (c->temporal_unit_size || c->frame_unit_size) - return AVERROR(EIO); + return AVERROR_INVALIDDATA; goto end; } @@ -260,7 +260,7 @@ retry: if (ret < 0) return ret; if (ret != obu_unit_size) - return AVERROR(EIO); + return AVERROR_INVALIDDATA; c->temporal_unit_size -= obu_unit_size + len; c->frame_unit_size -= obu_unit_size + len; -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".