summaryrefslogtreecommitdiff
path: root/addrmatch.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-01-19 15:30:02 +1100
committerDarren Tucker <dtucker@zip.com.au>2014-01-19 15:30:02 +1100
commit7b1ded04adce42efa25ada7c3a39818d3109b724 (patch)
tree38d0d51c0301411e9dfecd9c2024b48dde99a10b /addrmatch.c
parent293ee3c9f0796d99ebb033735f0e315f2e0180bf (diff)
- dtucker@cvs.openbsd.org 2014/01/19 04:17:29
[canohost.c addrmatch.c] Cast socklen_t when comparing to size_t and use socklen_t to iterate over the ip options, both to prevent signed/unsigned comparison warnings. Patch from vinschen at redhat via portable openssh, begrudging ok deraadt.
Diffstat (limited to 'addrmatch.c')
-rw-r--r--addrmatch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/addrmatch.c b/addrmatch.c
index fb6de92e..649de413 100644
--- a/addrmatch.c
+++ b/addrmatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: addrmatch.c,v 1.7 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: addrmatch.c,v 1.8 2014/01/19 04:17:29 dtucker Exp $ */
/*
* Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -88,13 +88,13 @@ addr_sa_to_xaddr(struct sockaddr *sa, socklen_t slen, struct xaddr *xa)
switch (sa->sa_family) {
case AF_INET:
- if (slen < sizeof(*in4))
+ if ((size_t)slen < sizeof(*in4))
return -1;
xa->af = AF_INET;
memcpy(&xa->v4, &in4->sin_addr, sizeof(xa->v4));
break;
case AF_INET6:
- if (slen < sizeof(*in6))
+ if ((size_t)slen < sizeof(*in6))
return -1;
xa->af = AF_INET6;
memcpy(&xa->v6, &in6->sin6_addr, sizeof(xa->v6));