From patchwork Fri Dec 10 11:07:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 48772 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 8788D3858025 for ; Fri, 10 Dec 2021 11:09:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8788D3858025 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1639134563; 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: From; b=dNE0Pb1qrhHPhzXv/vblDiFehtm//SSE8TfHNrnm5NHYDVIJvgH81P443YaGPaG9F EmbVHjdE+rZ2+Badk8svm8iweTnM9RLnUsUiFK1JHL6KztGyec0+IfaLIeNnH+FOkZ skus7r6cgJFMc6fby3/zD+lieReJQayQg6p8UPCI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-ua1-x92a.google.com (mail-ua1-x92a.google.com [IPv6:2607:f8b0:4864:20::92a]) by sourceware.org (Postfix) with ESMTPS id E14613858D35 for ; Fri, 10 Dec 2021 11:07:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E14613858D35 Received: by mail-ua1-x92a.google.com with SMTP id o1so16117128uap.4 for ; Fri, 10 Dec 2021 03:07:38 -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:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mj46Gqt6Cm0Er3p7GuzZXhAKypiyWs4l6fjNYsPmnPM=; b=vIAHqviiukX8Vmq0rrHNau0TvWnMpK0dKLkmzVCfsDdsUj6tP2qqNkgHfYykNJMs+H fWfvk8vyLsi5OqrCft/IwKjLvD52iQiqnR8FBohr6RSBEQHiLD63C9xviXSpUNy3q9fL 11dT/0AEBQZXe1+Un+1NNwCZnIGYp3Pv3AsMYWJCoJEKX9ix/0q0NFQgixO9woGIEYJS 3atJtCDFPflXhO2mA+3Ec/XgJ+YdZHlvWjpVBh+Xx8ZvV4TFuUogTZQWNx1qBQNNNex4 hfuglSObWBpyUUGPW+65dVzJiga+jcWmV5sXNAcrpLKKnmrPvNPVcd7V8MRTq2tE1Zg2 f5xw== X-Gm-Message-State: AOAM532mgvCtlPJfbTktpI96NDO/k1CRuJP2+NotMeyuf6xT3OEbs0+J Msr1mcvhqk8pi+Y2Z0aHmENbZSw8MVEIjw== X-Google-Smtp-Source: ABdhPJzkPI/P0/Aw2RVajT4LqMmeKyu4Pg+XyVr1qb/xTq3dK3zNbGQljAyN1KdePGjqvxRcjb/iKw== X-Received: by 2002:a05:6102:3ec9:: with SMTP id n9mr14849105vsv.22.1639134458295; Fri, 10 Dec 2021 03:07:38 -0800 (PST) Received: from birita.. ([2804:431:c7ca:a776:ce11:d591:8bd5:613f]) by smtp.gmail.com with ESMTPSA id w11sm1704758vkm.14.2021.12.10.03.07.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 03:07:38 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 2/3] inet: Remove strdupa from nrl_domainname() Date: Fri, 10 Dec 2021 08:07:32 -0300 Message-Id: <20211210110733.1499984-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211210110733.1499984-1-adhemerval.zanella@linaro.org> References: <20211210110733.1499984-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 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 Reply-To: Adhemerval Zanella 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