From patchwork Wed Nov 28 07:19:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 11200 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 F025744E0A9 for ; Wed, 28 Nov 2018 09:28:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E0E168A7D2; Wed, 28 Nov 2018 09:28:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f181.google.com (mail-it1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21E85689F4A for ; Wed, 28 Nov 2018 09:28:28 +0200 (EET) Received: by mail-it1-f181.google.com with SMTP id g85so2847848ita.3 for ; Tue, 27 Nov 2018 23:28:33 -0800 (PST) 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=gakmUO+NhF6PH/iAEb+fclezqwDWMUXP/pNpGvh3ors=; b=Nb1RBLs4jqMtvByk0sXCr4qgB7lbhdBx2r4oCSyElAz2pgZeP0aa4Hqg627Zl4WsPB VATrRy2O6/s6cOQfq6zITvpX3zsEqgeDMCTLkiJAE36FdlvjTgltRo0FqJU51bAG1Rya tSYX+fRjH3hG+GBJnLX4TZ+MWb4q6hlhQA1PGlBTYHsd3phoUvjf1IEH5lhs7CIAEdbm J0k1r1cYjPTLYJzBZ6xtQPHtkKjhn80utt9DjSvTaFdbfs1yQU+AqHaabPT7340c45vM AyjpVUmBlhgipmLIRKD3zye9yVixf+JGDpFAb+pnP+YzvqSEvqo0cKuXmtzo0LaxPOe7 TXBQ== 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=gakmUO+NhF6PH/iAEb+fclezqwDWMUXP/pNpGvh3ors=; b=YOnoE/Y382Ek1Oc82NwPzSX2snyg8p1tipesQcKhU4/bqUPKMun36wAABTEE0aE5IY 59kyYfFhSTx8ce+T7dqMewYtZ4tQY0tyjVf/n4BHsr0KeqPSrI4bapvYwFr9Dv+ENHyH tMKWmhNcnfVjHysQRarCPjTZJqIgfpJeulVUD6XB57ZJYne3auIi3f8IDZXgcXUlHtbe a28Rxc28VW+SiBjJGf/g7m21NopketZvdj0aoDURCJQFCb/rIDLwJDObuOmTMR72u8+i 9iMglaTbTVV12BSUHqj+ek/0/nlpWPuw68T2R1G9WhnNoHKAUBuDx0kB8Vw7Mljj9CTt OZxw== X-Gm-Message-State: AA+aEWbcwW6V5gBBDx+EN1y4EWXVyhemB82jUyB6TaHtfbhFEdXiyLI2 NSeEWBiRh5XNvX2x+B1C9St04B8D X-Google-Smtp-Source: AFSGD/WG8roz4NBXRgpC6sQOI5w3KYeg2GsOjC2fmULz46XnVuKVAqtb24n5pVIFz5dLN+zyyxvsCw== X-Received: by 2002:a24:5d11:: with SMTP id w17mr1924646ita.169.1543389610447; Tue, 27 Nov 2018 23:20:10 -0800 (PST) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id z1sm2207764iog.57.2018.11.27.23.20.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Nov 2018 23:20:09 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Nov 2018 01:19:59 -0600 Message-Id: <20181128071959.30447-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181128071959.30447-1-rodger.combs@gmail.com> References: <20181128071959.30447-1-rodger.combs@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavf/movdec: don't treat I/O errors as EOF 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" --- libavformat/mov.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 542e92ec00..607ce30178 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -645,7 +645,7 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom) for (type = 0; type != -1 && avio_tell(pb) < next; ) { if(avio_feof(pb)) - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; type = avio_rb16(pb); len = avio_rb16(pb); av_log(c->fc, AV_LOG_DEBUG, "type %d, len %d\n", type, len); @@ -2001,9 +2001,9 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->chunk_count = i; - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STCO atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -2535,9 +2535,9 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) sc->stsd_count++; } - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STSD atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -2669,9 +2669,9 @@ static int mov_read_stsc(MOVContext *c, AVIOContext *pb, MOVAtom atom) } } - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STSC atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -2723,9 +2723,9 @@ static int mov_read_stps(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->stps_count = i; - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STPS atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -2772,9 +2772,9 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->keyframe_count = i; - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STSS atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -2860,9 +2860,9 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_free(buf); - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STSZ atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -2938,9 +2938,9 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->nb_frames_for_fps += total_sample_count; } - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STTS atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } st->nb_frames= total_sample_count; @@ -3017,7 +3017,7 @@ static int mov_read_ctts(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->ctts_count = ctts_count; - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted CTTS atom\n"); return AVERROR_EOF; } @@ -3066,9 +3066,9 @@ static int mov_read_sbgp(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->rap_group_count = i; - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted SBGP atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } return 0; @@ -4912,9 +4912,9 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) fix_frag_index_entries(&c->frag_index, next_frag_index, frag->track_id, entries); - if (pb->eof_reached) { + if (avio_feof(pb)) { av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted TRUN atom\n"); - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; } frag->implicit_offset = offset; @@ -7627,7 +7627,7 @@ static int mov_switch_root(AVFormatContext *s, int64_t target, int index) if (ret < 0) return ret; if (avio_feof(s->pb)) - return AVERROR_EOF; + return pb->error ? pb->error : AVERROR_EOF; av_log(s, AV_LOG_TRACE, "read fragments, offset 0x%"PRIx64"\n", avio_tell(s->pb)); return 1;