From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2215 invoked by alias); 20 Jul 2011 08:20:41 -0000 Received: (qmail 2197 invoked by uid 22791); 20 Jul 2011 08:20:40 -0000 X-SWARE-Spam-Status: No, hits=-7.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 20 Jul 2011 08:20:25 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6K8KO3B008441 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 20 Jul 2011 04:20:24 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p6K8KMkf018316 for ; Wed, 20 Jul 2011 04:20:24 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Use size_t for strlen results X-Yow: LOU GRANT froze my ASSETS!! Date: Wed, 20 Jul 2011 08:20:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-07/txt/msg00010.txt.bz2 2011-07-20 Andreas Schwab * resolv/res_query.c (__libc_res_nquerydomain): Use size_t for strlen results. --- resolv/res_query.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resolv/res_query.c b/resolv/res_query.c index 26daf0d..67b6136 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -543,7 +543,7 @@ __libc_res_nquerydomain(res_state statp, { char nbuf[MAXDNAME]; const char *longname = nbuf; - int n, d; + size_t n, d; #ifdef DEBUG if (statp->options & RES_DEBUG) @@ -560,9 +560,8 @@ __libc_res_nquerydomain(res_state statp, RES_SET_H_ERRNO(statp, NO_RECOVERY); return (-1); } - n--; - if (n >= 0 && name[n] == '.') { - strncpy(nbuf, name, n); + if (n > 0 && name[--n] == '.') { + memcpy(nbuf, name, n); nbuf[n] = '\0'; } else longname = name; -- 1.7.6 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."