Received: from eggs.gnu.org ([2001:4830:134:3::10]:56499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHqOx-0008RL-MB for qemu-devel@nongnu.org; Tue, 28 Jun 2016 06:37:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHqOv-0000E3-Dz for qemu-devel@nongnu.org; Tue, 28 Jun 2016 06:37:54 -0400 Date: Tue, 28 Jun 2016 12:37:34 +0200 From: =?UTF-8?B?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= Message-ID: <20160628123734.500a3114@fiorina> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] curl: Operate on zero-length file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, qemu-trivial@nongnu.org This is an attempt to fix small bug 1596870. When creating new disk backed by remote file accessed via HTTPS and the backing file has zero length, qemu-img terminates with uniformative error message: qemu-img: disk.qcow2: CURL: Error opening file: While it may not make much sense to operate on empty file, other block backends (e.g. raw backend for regular files) seem to allow it. This patch fixes it for the curl backend. Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD --- block/curl.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/curl.c b/block/curl.c index da9f5e8..ee6c5ea 100644 --- a/block/curl.c +++ b/block/curl.c @@ -675,11 +675,17 @@ static int curl_open(BlockDriverState *bs, QDict *opt= ions, int flags, curl_easy_setopt(state->curl, CURLOPT_HEADERDATA, s); if (curl_easy_perform(state->curl)) goto out; - curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d); - if (d) - s->len =3D (size_t)d; - else if(!s->len) + if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &= d)) { goto out; + } + if (d < 0) { + pstrcpy(state->errmsg, CURL_ERROR_SIZE, + "Received invalid file length."); + goto out; + } + + s->len =3D (size_t)d; + if ((!strncasecmp(s->url, "http://", strlen("http://")) || !strncasecmp(s->url, "https://", strlen("https://"))) && !s->accept_range) { --=20 2.9.0