From patchwork Mon May 28 00:21:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 9114 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1371011jad; Sun, 27 May 2018 17:27:17 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKIFEBqeUWghPMS8hv1UAsEZXhsFOrlwuwV6uUScnnb2GeAXbxqJh7z6AgaHbgCJlqNAIuz X-Received: by 2002:a1c:e306:: with SMTP id a6-v6mr156408wmh.15.1527467237111; Sun, 27 May 2018 17:27:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527467237; cv=none; d=google.com; s=arc-20160816; b=wXJrlLYizgyzo1ZEiOVM2+du2Pa2JqK1cghPf7WeRaV9wggBhE74UEfs4Bnu7l42tu P57f1+dbqAFazBzNjjW/q73Va/UoQUat4uTTXTdJQbOrC8BMM2dGuN/pLejjfOf0AQLv yUMLbGHjSQ9TJTdYhNbPtMAWfbWwd5VLNtNJ0jLbju5OMcYPOM0D5UYnEQzbWohr/pdm v7qJBs16WrjTSLv8wwAsFTZ0puwzwPZ546GmIiUyf11sG+o4ARyk8UVH0MdWOqtV95oz 4eP/wKym98MnUF9/tPmkarYxzd/qtL96Xef7rjwWk84kIw2gEzI26jX5G4j5d3/h2cAl 3oew== 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=5+tOIgMP2gfRk719cbylXgrcRcyeZfpQX7SXU5h89Eo=; b=pGtDITc7Fr6IKvVr2eHWBVxVjQFZ3ClJvPnYfnJ+qh+SI0bmHHBCb4Gq8MclQcRmB8 8G2vzNq5wb9j8KzRw+0RxqercAwuc7RLWZFBUdmn7zfvkLM2S21f3Y75ilyd0wjZm02V emEApfGubsMe7caCjcy5ptXdnqVK5vnM9uYc6gMDHuwdfqs+r93mV+IwQG/wbyYfVWPb zNYHBFUcd1Ll4Xy6XQdl8xK/GdIU+xeiWqeymdAGLm/e0QAFHKiYuTk4mrzoXMuZTnCM AmEp8COvqE8Tso0E/6qd4VRD26sEYxe6kByykf5l9B84hjKG9/6GBu+N+b2iYU2SQKx9 8S/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=BuiS+o0Q; 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 z3-v6si1152409wrm.425.2018.05.27.17.27.16; Sun, 27 May 2018 17:27:17 -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=BuiS+o0Q; 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 1088968A202; Mon, 28 May 2018 03:26:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB43C68A056 for ; Mon, 28 May 2018 03:26:23 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id v131-v6so8480568wma.1 for ; Sun, 27 May 2018 17:27:07 -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=yvxjr8gQhbpniFRD91muezKbPSMtGfber3TDdOfeAk8=; b=BuiS+o0Q1PjCQZvPDd4iv4aorIUtZwy2uPdV0ujVqepm5xsm/7TFANELH89GtaG+PY KngY1gIV2KaUxLCnACU+VF97poxvRCPIXkvCn1psy1XJsAFL8xQlBmdkWP4GnIq++0SJ nQVjUG32RhybpLE5ITNkVTmPOXh7VG5Lt+AkSyko+2UTfA1WL1SVNvzU73KjTGdXrX7j bcqENX/pcDwyM/C1iGLslUH66Ic9WAOhY5oCIPN9UtFQesGqUwe7FBqILjouWw07TNG7 K+BtD2/ArTDGRdE23aIWW6Mt9rkXtYuVc+jsh7zleIDps7LZYTPjmT7FJvt45IdTnvPn f/nQ== 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=yvxjr8gQhbpniFRD91muezKbPSMtGfber3TDdOfeAk8=; b=T4beGXz8wbo3espQBunEo5h92hO5fRZ4owleytAp6UUDXmNrblnCrbS3y0Fl2v9ED0 mJeq10OpvDjdYYrTOT2kczRJOlQ+mPjViyRnyGDbwSW/guZyxVYtnhlydIGPegdd5WgA dt3uXW5sGEIdsLQ51jcwRDppccSxrrvp5xCSb9ESLPRhDr38lsRBeqV5ripJF7okPOHe cURrvsQdtD37h/MPKtpS539fpxWOCFKjQnJu0G5DCS1ODZSWj+fWxSahICDnlrRsZu7V b5MIzE8ZDKqb60Y7EtXaI0RPJ9Y2UKdrRahagjwEi46wINSrK4WUNH0bx0vLmIOwyibH 3Txw== X-Gm-Message-State: ALKqPwd+r4uiFdWeJOfM2na+9wizwXuVrOFzQs4EBW5oD/ByrFTjkD06 o1FBjluR+3yFndETuvPUxQV+nQa3 X-Received: by 2002:a2e:5559:: with SMTP id j86-v6mr6967061ljb.147.1527466897328; Sun, 27 May 2018 17:21:37 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id l24-v6sm5635471ljg.19.2018.05.27.17.21.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 May 2018 17:21:36 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 03:21:35 +0300 Message-Id: <20180528002135.24401-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] lavf/libssh: translate a read of 0 to 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Yet another case of forgotten 0 =! EOF translation. While the documentation for this specific synchronous read function does not mention it, the documentation for `sftp_async_read` documents it, as well as looking at the implementation of this function leads one to find `if (handle->eof) { return 0; }`. Reported by stnutt on IRC. --- libavformat/libssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/libssh.c b/libavformat/libssh.c index 9e3d4da45e..21474f0f0a 100644 --- a/libavformat/libssh.c +++ b/libavformat/libssh.c @@ -295,7 +295,7 @@ static int libssh_read(URLContext *h, unsigned char *buf, int size) av_log(libssh, AV_LOG_ERROR, "Read error.\n"); return AVERROR(EIO); } - return bytes_read; + return bytes_read ? bytes_read : AVERROR_EOF; } static int libssh_write(URLContext *h, const unsigned char *buf, int size)