From patchwork Thu Aug 23 21:38:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 10111 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2620629jap; Thu, 23 Aug 2018 14:38:33 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaLaoBA4NocwgZ5LHGnv5ZsNjY+q3PTC9EhvoxmWfsph1+2p74gmJHmeEwuB8vypWNgUrh8 X-Received: by 2002:a5d:4783:: with SMTP id w3-v6mr9926867wrq.188.1535060313636; Thu, 23 Aug 2018 14:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535060313; cv=none; d=google.com; s=arc-20160816; b=0ireN3Mk6nB3jCzQsfZeOc8JlaZZfC/Gudm3WEgz8qBcorRQ9JSoQ8HzQvvXFsIu+J H+eHvSX6qIbJRbmkiuKugoImKqPHScXMOzUIyu1hUd7F6fSyGLo2ZUhDUHyFi1bE/GcU YNIqLruj6woIhhxZd9lZxJGdeKmYW0OcdfYLXKUKKM4s0nxUGuQBRr3SeVGUK8Vy0IMw m3MD/SMQpUb0UsJxrNagXUTbhLySrQA4gMzT/3kFaQwRGFC8hTB5Md3Gjn+qVbNUsVBS hEsSz/SVWBORoss27WmfdFxbgXbQFQ14t4fK+vyqor+reiWXNLAQMz0gMx/Sj9dl7SBB 0F8Q== 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:dkim-signature :delivered-to:arc-authentication-results; bh=Tcjc1I/uwO9BkH4BXTIysowexArmmocNZ2OnJpV0z0U=; b=frhwdAHXAWCQo9trIB32ULPzc36s1xYhA8mJYWight06YjY/QOnATwI/wczyMQCz/s B84+6cuuLDY2frSttzUdhrtFpeR/uLLwxprLxsCcLr7p6MCQeeyO8kFLq+toqW7cpeC6 Lj40V8/mKS/EarHLDXDA6e/8zAQEQp/mis6qGy20Od4P9QJy+Y63LyoPBItz3YLfQ9qB sRwRVY8Gy/y2fJRpsz3h9QyEQ6wayyVDZQkGUXcCVWYy5PZRyi98K08/VImmtavIcc6B NTiKGRTr4HgmpfcNetYTkFGVhXLpk5GKhAnRGeUaEdVxLaVHyIqY1Ur8hfg/1HwyPPDC x3/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OXCXXE8S; 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 m22-v6si4362527wrf.434.2018.08.23.14.38.33; Thu, 23 Aug 2018 14:38:33 -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=20161025 header.b=OXCXXE8S; 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 48209689DBE; Fri, 24 Aug 2018 00:38:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3C076805E8 for ; Fri, 24 Aug 2018 00:38:28 +0300 (EEST) Received: by mail-it0-f47.google.com with SMTP id g18-v6so4325148itg.2 for ; Thu, 23 Aug 2018 14:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ssgCRKNPvYgiIlVIL0sI9zvdkNN3GQxyJc/KFsrfXsk=; b=OXCXXE8SnVyE7eo1tk5Ua9X05h+7IUJba9g3uOC8TufWcanQuNw1usoxVNB/TkNb5O 9/E6K59O1X+8PahsB9hMXN9BuDI65Optj53xPi3GUnHT5W6pfcYc/uyhT5lJjH94GYxt 8rYWRGNSps4ZTjmFBsXCChCm+mjq0X12Inbj1bbIIpEEvQMSByA5xttnChE/Ya1sWkP1 NmQ8+CdAm+O72pVDMXyrtZkPbZ0hYSHIimOK3AG4/Xul6lkvjdfUJDdnSYFcI1M94yoC 4DIvJ9r9wn43GkJ4RTkK6Usa7d3V8m7fcIrL0y3hGHZVDmFYzUNOulpnVAEfcyI908mM adsg== 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; bh=ssgCRKNPvYgiIlVIL0sI9zvdkNN3GQxyJc/KFsrfXsk=; b=ru6NbrYtR1pC2P+5bJf/JON2Ixjck4pr+QuchqCfO7601nTRXYQ6OecV/rVuaMl0B9 nnvVUIxEdhsqrrKwCMVXevvRQeopuHdJHwaTg5CaNkQC2DOsBDhPjARUDUNmFISpDkg1 M1kdss/OXAbOoX4QdO1mXW0yfPYvzwB99yOcgzxM3zihxVlAitvzT7Ru7IpileqWinph Z015FsePAKRhNBbZGkL4i5qMc14WQRyPzVXlFx8HDNFPyul0BFic/heq7241w+J3kWSO 4dPjLuvTvhppNri8WlEg27yD1SGMB+yEb9RWYxb98eHDY2LcAuxIf1iCzWlqx9alGrpL niUg== X-Gm-Message-State: APzg51BofSZ+6v/n7MxJ2q5D/1dCtz3p7uVlYlszOcWotNppb2yC9OHl JaugBFxBYpmf0sZQq6SnM6X95yPd X-Received: by 2002:a24:620f:: with SMTP id d15-v6mr7913014itc.135.1535060308825; Thu, 23 Aug 2018 14:38:28 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id l75-v6sm2562619itl.5.2018.08.23.14.38.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Aug 2018 14:38:27 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Aug 2018 16:38:23 -0500 Message-Id: <20180823213823.36969-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH] lavf/mpegts: improve read error handling 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" We previously could fail to check errors entirely, or misinterpret read errors as normal EOFs. --- libavformat/mpegts.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 37a6aa8bff..1350213d39 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2475,6 +2475,8 @@ static int mpegts_resync(AVFormatContext *s, int seekback, const uint8_t *curren for (i = 0; i < ts->resync_size; i++) { c = avio_r8(pb); + if (pb->error) + return pb->error; if (avio_feof(pb)) return AVERROR_EOF; if (c == 0x47) { @@ -2498,8 +2500,13 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size, for (;;) { len = ffio_read_indirect(pb, buf, TS_PACKET_SIZE, data); - if (len != TS_PACKET_SIZE) - return len < 0 ? len : AVERROR_EOF; + if (len != TS_PACKET_SIZE) { + if (len < 0) + return len; + if (pb->error) + return pb->error; + return AVERROR_EOF; + } /* check packet sync byte */ if ((*data)[0] != 0x47) { /* find a new packet start */ @@ -2670,6 +2677,8 @@ static int mpegts_read_header(AVFormatContext *s) /* read the first 8192 bytes to get packet size */ pos = avio_tell(pb); len = avio_read(pb, buf, sizeof(buf)); + if (len < 0) + return len; ts->raw_packet_size = get_packet_size(buf, len); if (ts->raw_packet_size <= 0) { av_log(s, AV_LOG_WARNING, "Could not detect TS packet size, defaulting to non-FEC/DVHS\n");