From: lilydjwg <lilydjwg@gmail.com>
To: elfutils-devel@sourceware.org
Cc: lilydjwg <lilydjwg@gmail.com>
Subject: [PATCH v2 1/2] debuginfod-client.c: Fix download size not correctly fallbacks to x-debuginfod-size header
Date: Wed, 29 Mar 2023 23:02:36 +0800 [thread overview]
Message-ID: <20230329150237.896092-1-lilydjwg@gmail.com> (raw)
In-Reply-To: <ZCRR6lH1rbIWy1nd@lilyforest.localdomain>
Signed-off-by: lilydjwg <lilydjwg@gmail.com>
---
ChangeLog | 5 +++++
debuginfod/debuginfod-client.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 10c23002..05697a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-29 lilydjwg <lilydjwg@gmail.com>
+
+ * debuginfod/debuginfod-client.c: Fix download size not correctly
+ fallbacks to x-debuginfod-size header
+
2023-03-03 Mark Wielaard <mark@klomp.org>
* NEWS: Add ELFCOMPRESS_ZSTD support for libelf and elfcompress.
diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index b33408eb..d6d3f0dd 100644
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -1467,7 +1467,7 @@ debuginfod_query_server (debuginfod_client *c,
goto out2;
}
- long dl_size = 0;
+ long dl_size = -1;
if (target_handle && (c->progressfn || maxsize > 0))
{
/* Get size of file being downloaded. NB: If going through
@@ -1486,7 +1486,7 @@ debuginfod_query_server (debuginfod_client *c,
curl_res = curl_easy_getinfo(target_handle,
CURLINFO_CONTENT_LENGTH_DOWNLOAD,
&cl);
- if (curl_res == CURLE_OK)
+ if (curl_res == CURLE_OK && cl >= 0)
dl_size = (cl >= (double)(LONG_MAX+1UL) ? LONG_MAX : (long)cl);
#endif
/* If Content-Length is -1, try to get the size from
@@ -1527,7 +1527,7 @@ debuginfod_query_server (debuginfod_client *c,
}
- if ((*c->progressfn) (c, pa, dl_size))
+ if ((*c->progressfn) (c, pa, dl_size == -1 ? 0 : dl_size))
{
c->progressfn_cancel = true;
break;
--
2.40.0
next prev parent reply other threads:[~2023-03-29 15:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 4:51 [PATCH] " lilydjwg
2023-03-29 12:28 ` Frank Ch. Eigler
2023-03-29 14:57 ` lilydjwg
2023-03-29 15:02 ` lilydjwg [this message]
2023-03-29 15:02 ` [PATCH v2 2/2] debuginfod-client.c: Fix x-debuginfod-size counts differently than CURLINFO_SIZE_DOWNLOAD_T lilydjwg
2023-03-29 19:14 ` Frank Ch. Eigler
2023-03-30 3:41 ` lilydjwg
2023-03-30 17:24 ` Frank Ch. Eigler
2023-03-31 4:50 ` lilydjwg
2023-08-29 13:17 ` Mark Wielaard
2023-08-29 18:33 ` PR30809, was " Frank Ch. Eigler
2023-08-29 19:26 ` Mark Wielaard
2023-03-29 20:49 ` [PATCH v2 1/2] debuginfod-client.c: Fix download size not correctly fallbacks to x-debuginfod-size header Frank Ch. Eigler
2023-03-29 15:05 ` [PATCH] " lilydjwg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230329150237.896092-1-lilydjwg@gmail.com \
--to=lilydjwg@gmail.com \
--cc=elfutils-devel@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).