* [PATCH] Use size_t for strlen results
@ 2011-07-20 8:20 Andreas Schwab
0 siblings, 0 replies; only message in thread
From: Andreas Schwab @ 2011-07-20 8:20 UTC (permalink / raw)
To: libc-hacker
2011-07-20 Andreas Schwab <schwab@redhat.com>
* 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."
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-20 8:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-20 8:20 [PATCH] Use size_t for strlen results Andreas Schwab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).