From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6DA724C703 for ; Mon, 4 Aug 2025 22:55:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A234E68BEDB; Tue, 5 Aug 2025 01:55:17 +0300 (EEST) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C3E67687C16 for ; Tue, 5 Aug 2025 01:55:10 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-76b6422756fso5778773b3a.2 for ; Mon, 04 Aug 2025 15:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754348108; x=1754952908; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=U+QvE8ftw93+NTAsEKfYcQpWavuK6KRmtMrCDR0NoHc=; b=OzH/3JkBy7Ch/RgTzbUVU3BFn2SrSVN2l6Oc8/riKmR5F7w7ZsLJc3owtASGj+SJNC pmY/XbnheYJuobnxn4PstZ1MMJht65IdEK0t5nrLnFjs/e7GfHHqse/OB40bxKKMneH+ vZw4BvUjOZEYQrJzp4LBFRSC8xszXlP9xoxxuhLlaGMkY6p+2HTlcGgfkWfC1+9zidRp AFmva8oQAFXGJdq6fw3EOS1Ob0QDNndD6lKao0Xkl35/JQKQBVJlVGm1oLLSJcbv9AiI Aq1b2kwo2gmwhOx4DaMkPPzMTFcihq+eLom6nofCNy1qTY0lXTDi5owv/lhUwSCzU4Pt pFZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754348108; x=1754952908; 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=U+QvE8ftw93+NTAsEKfYcQpWavuK6KRmtMrCDR0NoHc=; b=Ea4wRizTY/7bNco+sN7x7wnMfR+ybdtBseAx2sZmQ+Hcew2MIVFhlxh8eCNq2d2eZe 57Xs6GSGvJd7Q4soOZxj5JYX2T2EEfboo/Lf/ZNyxRrsokhirUs7JJT89XmYrGQAfGUA mAGc7PQlK47efbp3Uw9J+BEtmBziC7i0zOKF9YiJAG+qCC4REVCTv3+stwWj0ooHIoof ux6a6S6mlSQKdyIToszw+pZTSnTUcrkl9uGpL41WboS8K5MXDvJswxHoP3VtH23y/DQy sz6WzkCKQX8kZyy3TVBQbkuK31j3QP8d3prmiC4h9W7LCeZGZNr3Gb0qvWhT+rZ8ya7M Wquw== X-Gm-Message-State: AOJu0YxJLGJ3re/RdMFgJH1ivDu0K6gfRkGibdFmZp5RUC535cQCCkqL vYxCIT80hwXmeKtH3EdCLoUHCRAqKhH5G+FRunUCxUfAK+ERrdrYqmth0QYJRg== X-Gm-Gg: ASbGnct+qXeiZT7wom7PSqltCOaS1Rq+UApsS21J3s9gGji/k0KKcUnqlnigokGy7Pb 4mv7yTC+QEzzW2JacWDdMEp/c7COiMxr4i3eS4q+wtKyHti4nYCuaOOIbmvXvqdDo6k8lcGylK7 pGq66DaRw3l7iNQBABveftPKFJqrPClxrGgI+RH21+8xY1htndoeJCW7Mxdoy5MWAyr2jBnpM0P hx4DgAsMshI7NAfsRxTqG1U6PwUDRB2ox3ukXcv+pILuZs6yEzU2weuDp3DzmacKN792ziYPLXT w+dObNGpo/nQarHL/Qha1xX55qtIT69VY9OpkSjLx8aZM0HiQ/jFYG5lgNCOKW7yaucNFoGPvST Uy8DmQnMqc/doeUObsBOE6LgW1L5MC5tF43Uths0M X-Google-Smtp-Source: AGHT+IFtn8dqQmYY5xPEmYH7Guq9ZPnv12Lyv2Ly5knLklz6OVwGjWhfRnXUlW3+HeR0WrxPJubthA== X-Received: by 2002:a05:6a00:a21:b0:748:e38d:fed4 with SMTP id d2e1a72fcca58-76bec314c94mr14803018b3a.6.1754348108096; Mon, 04 Aug 2025 15:55:08 -0700 (PDT) Received: from Gryph ([2800:2121:b000:82e:ed0d:41db:1378:e184]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76bccfe9172sm11354243b3a.126.2025.08.04.15.55.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 15:55:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Aug 2025 19:54:41 -0300 Message-ID: <20250804225441.2028-1-jamrial@gmail.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/iff: fix EOF check 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: The check to return on EOF should not be inside a block that will not be entered after reaching EOF. Should fix "libavcodec/bytestream.h:144:27: runtime error: applying zero offset to null pointer". Signed-off-by: James Almer --- libavformat/iff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/iff.c b/libavformat/iff.c index 4ff10beb38..44ba5a9023 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -969,9 +969,6 @@ static int iff_read_packet(AVFormatContext *s, uint32_t chunk_id, chunk_id2; while (!avio_feof(pb)) { - if (avio_feof(pb)) - return AVERROR_EOF; - orig_pos = avio_tell(pb); chunk_id = avio_rl32(pb); data_size = avio_rb32(pb); @@ -988,6 +985,9 @@ static int iff_read_packet(AVFormatContext *s, avio_skip(pb, data_size); } } + if (pb->eof_reached) + return AVERROR_EOF; + ret = av_get_packet(pb, pkt, data_size); pkt->stream_index = iff->video_stream_index; pkt->pos = orig_pos; -- 2.50.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".