From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from weasel.tulip.relay.mailchannels.net (weasel.tulip.relay.mailchannels.net [23.83.218.247]) by sourceware.org (Postfix) with ESMTPS id 385E63858016 for ; Wed, 28 Sep 2022 16:50:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 385E63858016 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=sourceware.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 81C5A2A2834; Wed, 28 Sep 2022 16:49:59 +0000 (UTC) Received: from pdx1-sub0-mail-a304 (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0B88B2A1BAE; Wed, 28 Sep 2022 16:49:59 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1664383799; a=rsa-sha256; cv=none; b=S4eEB8BlrerVpCAVepeQZw0PmMZvi06YidpBQqjlkTdzQv/3ntH6nwSYan1V2LWSmqwpIh yX/yEMqt6Xu4yxIw3t6zHVLJJszcsNn7IRZctm0PqhcWqChy50H/jiXYiOlUWHBmGD30Tl xXxn2DGMsV989o4GbF6o/HSutnqxf0gG7Z0N9Rkmmv8yCpGHTcbNvCyq3f0vSuiK1II0/N pQGqYZYVuLqToMuhe+kq9qwT6twigkkdct1xvdr+LqI5ujngDkY9YqfeCQERs68egdZjlk ezmEREGdBHBL+O56wlwybTtW9srwSEHx4Cs7wR0qRcEptoXONPf4BSQXzqNY3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1664383799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtxzqlMBMc8KuCpA66sv9zbzY63BgFb6YyOPlmcIkIY=; b=NgNJgYhTsr5LoU9brYSPu4SVNbAYAFa+saT/I0sbnxZkEMPyDl8aHflYxf7IBy9bhtfeua HGUwBEze+JEBzHfEIEhEAnFjI4Fhjj6whr0r11vZnB3/Uo44AVz3eseRbMxU3GLGoet1eV C/axm6FcY+zRTf2j0wrA1a8BJ2kr0245qrxQ9yA76Z/NOK88P5rg9fnI2m8bVosdB0Qbwy IegPimX7VnTsSLT8wxigJ68Js5aPL6c8kdgJQWza3Z0SLDjz/aIN49KNzVKKJ0P++06Qo0 fk3Y/ohnUxZpr1TImFwli75jtz/tIbavoEAJRaK4kT5IyT/QGo0azvJMcEtATQ== ARC-Authentication-Results: i=1; rspamd-6d4bb977-nwwxz; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Attack-Cellar: 50b29ace5b01e93c_1664383799315_3581224204 X-MC-Loop-Signature: 1664383799315:1999086943 X-MC-Ingress-Time: 1664383799315 Received: from pdx1-sub0-mail-a304 (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.120.38.142 (trex/6.7.1); Wed, 28 Sep 2022 16:49:59 +0000 Received: from fedora.redhat.com (bras-vprn-toroon4834w-lp130-16-184-147-84-238.dsl.bell.ca [184.147.84.238]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a304 (Postfix) with ESMTPSA id 4Md2Xj5g0fz10; Wed, 28 Sep 2022 09:49:57 -0700 (PDT) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?= Subject: [committed 2.36] get_nscd_addresses: Fix subscript typos [BZ #29605] Date: Wed, 28 Sep 2022 12:49:52 -0400 Message-Id: <20220928164952.1854261-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1173.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_SOFTFAIL,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 List-Id: From: Jörg Sonnenberger Fix the subscript on air->family, which was accidentally set to COUNT when it should have remained as I. Resolves: BZ #29605 Reviewed-by: Siddhesh Poyarekar (cherry picked from commit c9226c03da0276593a0918eaa9a14835183343e8) --- sysdeps/posix/getaddrinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index bcff909b2f..5cda9bb072 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -540,11 +540,11 @@ get_nscd_addresses (const char *name, const struct addrinfo *req, at[count].addr[2] = htonl (0xffff); } else if (req->ai_family == AF_UNSPEC - || air->family[count] == req->ai_family) + || air->family[i] == req->ai_family) { - at[count].family = air->family[count]; + at[count].family = air->family[i]; memcpy (at[count].addr, addrs, size); - if (air->family[count] == AF_INET6) + if (air->family[i] == AF_INET6) res->got_ipv6 = true; } at[count].next = at + count + 1; -- 2.37.2