From patchwork Wed Mar 29 04:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lilydjwg--- via Elfutils-devel X-Patchwork-Id: 67067 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4B063858289 for ; Wed, 29 Mar 2023 04:51:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A4B063858289 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680065511; bh=t/pOy+2+1VAUPCZUApKcwTv54CicLfJsTm/tH9SLlMA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Help:List-Subscribe:From:Reply-To:From; b=ndRJ8746Jyun6o4mQsxhwfK7skit8nbteLc4kmPenOpYq53x7jRQRjWXQCCJ5nBJo lm/ssoOqZKhlgacYAidjWpbHXfMT4R5VjUgWlmubPLTajJ2+azhA6vymvVsOGpblzl bprpLJnx94vFiI4vsuHxrQErxt63mrqE2fGZLa4o= X-Original-To: elfutils-devel@sourceware.org Delivered-To: elfutils-devel@sourceware.org Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by sourceware.org (Postfix) with ESMTPS id 0636E3858D39 for ; Wed, 29 Mar 2023 04:51:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0636E3858D39 Received: by mail-pj1-x102a.google.com with SMTP id qe8-20020a17090b4f8800b0023f07253a2cso14930021pjb.3 for ; Tue, 28 Mar 2023 21:51:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680065500; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=t/pOy+2+1VAUPCZUApKcwTv54CicLfJsTm/tH9SLlMA=; b=g3Mq3a7ZGJAuyJ5lNF7qSAtIwnnizPG6ZjYubzB0SFNvlJroBIxlAWQd7ISb39vtfw b42mFrX+ehnKE9Qkhj7SKF/kRda1kXyhHf5L2a1DQIBimTcXQW7F2hrNsK2NtRxpXF3q NrKKnkJ/bxkotFBgawCw2CQLSmxIrMoH+4gkNLMh5dUpbRLnWQLO6LW67a2lGjSJmrki R06w5qlAkxOeIZBu3pGssM01Gs2orvI4Uu0de2yiyaJeD0oR7GQGiNXT9vhOZ4QUi6Mu 9i4dk9V6WgOajcHQjegalOFde4yM0j2cYOUO/fEUYDzHd2dbfpWwfAN3tmq+5zPJrw67 SVVQ== X-Gm-Message-State: AAQBX9fujtxY9VQapoVxB6aVxzYAtJ50opatK5W9Zm99i4QKBtoTelL5 rxlr+a/9owhejGqGSaK7Qfpbiz+L62WMNrpUsCY= X-Google-Smtp-Source: AKy350bLpJYeMl9vTytIIcHalyaFKuR6yktvMOnpbMeZnHU8ftUcIUmCoq5Bf1xlZeJX9prPLgMn0Q== X-Received: by 2002:a17:902:e345:b0:1a1:dc27:202b with SMTP id p5-20020a170902e34500b001a1dc27202bmr14834912plc.20.1680065500577; Tue, 28 Mar 2023 21:51:40 -0700 (PDT) Received: from localhost ([2a0c:b641:69c:e9b8:1::1]) by smtp.gmail.com with ESMTPSA id i5-20020a1709026ac500b0019a7ef5e9a8sm2563764plt.82.2023.03.28.21.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 21:51:40 -0700 (PDT) To: elfutils-devel@sourceware.org Cc: lilydjwg Subject: [PATCH] debuginfod-client.c: Fix download size not correctly fallbacks to x-debuginfod-size header Date: Wed, 29 Mar 2023 12:51:19 +0800 Message-Id: <20230329045119.763709-1-lilydjwg@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: lilydjwg--- via Elfutils-devel From: lilydjwg--- via Elfutils-devel Reply-To: lilydjwg@gmail.com Errors-To: elfutils-devel-bounces+patchwork=sourceware.org@sourceware.org Sender: "Elfutils-devel" From: lilydjwg Currently when the debuginfod server doesn't set Content-Length but set x-debuginfod-size header, it's ignored and the progressfn doesn't know the total size. This happens for me with Arch Linux's debuginfod server and gdb. The reason is that when Content-Length is unavailable, cl is set to -1 by curl but dl_size remains as 0, but later dl_size == -1 is checked. Signed-off-by: lilydjwg --- ChangeLog | 5 +++++ debuginfod/debuginfod-client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 10c23002..05697a02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2023-03-29 lilydjwg + + * debuginfod/debuginfod-client.c: Fix download size not correctly + fallbacks to x-debuginfod-size header + 2023-03-03 Mark Wielaard * NEWS: Add ELFCOMPRESS_ZSTD support for libelf and elfcompress. diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c index b33408eb..e494adec 100644 --- a/debuginfod/debuginfod-client.c +++ b/debuginfod/debuginfod-client.c @@ -1479,7 +1479,7 @@ debuginfod_query_server (debuginfod_client *c, curl_res = curl_easy_getinfo(target_handle, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &cl); - if (curl_res == CURLE_OK && cl >= 0) + if (curl_res == CURLE_OK) dl_size = (cl > LONG_MAX ? LONG_MAX : (long)cl); #else double cl;