From patchwork Thu Nov 12 22:10:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 23610 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 44CA4449CC9 for ; Fri, 13 Nov 2020 00:17:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C30568C15B; Fri, 13 Nov 2020 00:17:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0A6468C1F1 for ; Fri, 13 Nov 2020 00:17:46 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id p19so7026266wmg.0 for ; Thu, 12 Nov 2020 14:17:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=RmQ5wYYk6pISFV6LyuZ2xqLJQSdoJ5/NLyt6jOPy4Nc=; b=dQwQ6iaVCIKZoJ/lAYshlYk/hKxhEgkKpV6rI6JMewJJBF5BOpMKDraQTBQ1J6Vy1U 1JEoTPaD9BKc83jW5QsyPUZUAkdtv1aL9U4xbV2qhSidHhPj+uG1eY+cTWO0Qneqi7Tu CwtgIMiGpeYzmIPR6NnnGzE01y+3g2RqzdY8sdKHHXwD5EOcdek28Gfp8Rde8ez3GPyb 5Lb4JtF7Uy1Emoc9PerOCLvnF/DEi7x2OzprsME7wa9yU7qc73p5LgueavSb9R97qeRg g+Ka0HapU6HUryTX8mYC3D5PdkOe9lGxnV2whi87gvATLR9v0SbOfYrFUHNzeHbnF82W w9WQ== 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:mime-version :content-transfer-encoding; bh=RmQ5wYYk6pISFV6LyuZ2xqLJQSdoJ5/NLyt6jOPy4Nc=; b=YcnetIJqRT4J9UVn1z3lfACizeVCch11/rpEg47zMywPRsZIZUGTnpLnCikA0FkcLv r7TAN004mPwK8flP4MuV/8uDLtBi+aod1PndaRMpOJqv6mSLt7Mbza7kw3l1IlPKMrch pR7UJSod+PqrTr+oX3Ma0Qtdy6/BfFj3dvdJdzz1CQSfUJ2DGuuqhUELFCoimsYyBafq eHpUl7ejdeGU8JjRC1uyWtxG7qF+pNYiZCJWA+d6DPzf4hfAa0qWKxUr55EP7yPLJM1D QG2NdgWwTNiu/63SIUTMDE/zsmXuc6p3n8aMykgBMa0EarRAvdiUP2Wo4Uo8CRt82jTC S7zw== X-Gm-Message-State: AOAM530q8dxBaIVav0TjFGBsV+aF/PYQdJxDmG7yyGfQ2yfjh4zGhxXo flYx6lOym09H8lWCnWRZ4ZE1M+yrlCzghr1x X-Google-Smtp-Source: ABdhPJzCoOsqLW9xX9i8DHVJeMVDnXnMuSxZ5sClpJHhAErpcWNofLcobecN0mkxSLzrL86tN+BMZg== X-Received: by 2002:a1c:4346:: with SMTP id q67mr1683779wma.170.1605219061034; Thu, 12 Nov 2020 14:11:01 -0800 (PST) Received: from localhost (host-96-177.parnet.fi. [77.234.96.177]) by smtp.gmail.com with ESMTPSA id v6sm9399252wrb.53.2020.11.12.14.11.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 12 Nov 2020 14:11:00 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Nov 2020 00:10:59 +0200 Message-Id: <20201112221059.68098-1-martin@martin.st> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] http: Check for AVERROR_EOF in the check for premature end 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" When the check was added (in 3668701f9600, in 2015), some IO functions returned 0 on EOF (in particular, the TCP protocol did, but the TLS protocol returned AVERROR_EOF). Since 0e1f771d2200d in 2017, the TCP protocol also returns AVERROR_EOF instead of 0, making the check for premature end never have the intended effect. --- libavformat/http.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/http.c b/libavformat/http.c index 3d25d652d3..2d24c00e18 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -1436,7 +1436,8 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size) if ((!s->willclose || s->chunksize == UINT64_MAX) && s->off >= target_end) return AVERROR_EOF; len = ffurl_read(s->hd, buf, size); - if (!len && (!s->willclose || s->chunksize == UINT64_MAX) && s->off < target_end) { + if ((!len || len == AVERROR_EOF) && + (!s->willclose || s->chunksize == UINT64_MAX) && s->off < target_end) { av_log(h, AV_LOG_ERROR, "Stream ends prematurely at %"PRIu64", should be %"PRIu64"\n", s->off, target_end