From patchwork Fri Nov 12 14:21:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 47528 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 340633858030 for ; Fri, 12 Nov 2021 14:23:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 340633858030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1636726985; bh=mj46Gqt6Cm0Er3p7GuzZXhAKypiyWs4l6fjNYsPmnPM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=LmU2GffuoSJeyji1qHcVg8HCHRxKSfHQxn2BweUlyA2eniAGi2lHZuV+Fm7n4zitO IbyzzVWoQkVttZax6tDjiVoSaupdOExS2dBabGhjg8mo/A9rX7WkuhZ8QGypID8idd PfEXieQhrhXjKdyMCzoX0QwMIzOk0/JD27OQiuqI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x92f.google.com (mail-ua1-x92f.google.com [IPv6:2607:f8b0:4864:20::92f]) by sourceware.org (Postfix) with ESMTPS id 9F826385841B for ; Fri, 12 Nov 2021 14:21:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9F826385841B Received: by mail-ua1-x92f.google.com with SMTP id t13so19085571uad.9 for ; Fri, 12 Nov 2021 06:21:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mj46Gqt6Cm0Er3p7GuzZXhAKypiyWs4l6fjNYsPmnPM=; b=ZZJ6jgFoTf3Cxt9yIMk3XkK+dzFEpNip4zbgpLSgfkQ3PY4mpoiWjPEPfdiJ6eta2A tuCxDQ6thgIliPEoFvvQ7MHrCL7wxZKUfpETZtHsoGJU8qIBYbPDNNy8Ovyx9b5/pE9d CIEfbYN+rVpLrw1hzJ49NdGTRk1PaWQjZ04R9+SMHQTHOX2UqAvYBj2rbtprwzt3v1Cq CTEgCoUIiqjLO5AGGuEXbcKojGnvygqIbcxQgVxEAdaJo+0M9ikhmFO+TFVLQQ+fevuJ OAk9TaTxx5Mpifba5JLGMh4Vj8YYN0KTHRgKvI9UdqN/hXXX5DFUX4jvSNKM+tCYtHEd AGdg== X-Gm-Message-State: AOAM532melN1OJPtPU/0frXmpmeo+QgH9ECmESHqLBM262L78FY1OB51 xBv/9tbOOBf9/ZL3NnNfepVOKHmqektsvw== X-Google-Smtp-Source: ABdhPJyWyNr25XYaE6crARopu2AA3+deJvZDYyipp/I+7QloB0clx9nresT5yvhROwtN3LuzoheQfQ== X-Received: by 2002:a67:c890:: with SMTP id v16mr10498855vsk.4.1636726881080; Fri, 12 Nov 2021 06:21:21 -0800 (PST) Received: from birita.. ([2804:431:c7cb:55a:ec9e:6037:1db6:e51]) by smtp.gmail.com with ESMTPSA id z188sm3902946vsz.12.2021.11.12.06.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Nov 2021 06:21:20 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname() Date: Fri, 12 Nov 2021 11:21:13 -0300 Message-Id: <20211112142114.239913-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211112142114.239913-1-adhemerval.zanella@linaro.org> References: <20211112142114.239913-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Cc: leonardo.macchia@gmail.com Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" We can use the already in place scratch_buffer. Checked on x86_64-linux-gnu. --- inet/getnameinfo.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c index 5eee354200..2d2397e7dc 100644 --- a/inet/getnameinfo.c +++ b/inet/getnameinfo.c @@ -118,15 +118,15 @@ nrl_domainname_core (struct scratch_buffer *tmpbuf) else { /* We need to preserve the hostname. */ - const char *hstname = strdupa (tmpbuf->data); - while (__gethostbyname_r (hstname, &th, - tmpbuf->data, - tmpbuf->length, + size_t hstnamelen = strlen (tmpbuf->data) + 1; + while (__gethostbyname_r (tmpbuf->data, &th, + tmpbuf->data + hstnamelen, + tmpbuf->length - hstnamelen, &h, &herror)) { if (herror == NETDB_INTERNAL && errno == ERANGE) { - if (!scratch_buffer_grow (tmpbuf)) + if (!scratch_buffer_grow_preserve (tmpbuf)) return; } else