summaryrefslogtreecommitdiff
path: root/addrmatch.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-30 08:32:29 +1000
committerDamien Miller <djm@mindrot.org>2012-06-30 08:32:29 +1000
commit97f43bbfc9be102ca285af28afc288d90afa6712 (patch)
tree58c167cc9ea7b3a731f42ac361fd0e992752e867 /addrmatch.c
parent8908da7dce7711af59c7f43b122f73293dca27ab (diff)
- dtucker@cvs.openbsd.org 2012/06/21 00:16:07
[addrmatch.c] fix strlcpy truncation check. from carsten at debian org, ok markus
Diffstat (limited to 'addrmatch.c')
-rw-r--r--addrmatch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/addrmatch.c b/addrmatch.c
index 5b6773cce..388603cae 100644
--- a/addrmatch.c
+++ b/addrmatch.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: addrmatch.c,v 1.5 2010/02/26 20:29:54 djm Exp $ */ 1/* $OpenBSD: addrmatch.c,v 1.6 2012/06/21 00:16:07 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> 4 * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -318,7 +318,7 @@ addr_pton_cidr(const char *p, struct xaddr *n, u_int *l)
318 char addrbuf[64], *mp, *cp; 318 char addrbuf[64], *mp, *cp;
319 319
320 /* Don't modify argument */ 320 /* Don't modify argument */
321 if (p == NULL || strlcpy(addrbuf, p, sizeof(addrbuf)) > sizeof(addrbuf)) 321 if (p == NULL || strlcpy(addrbuf, p, sizeof(addrbuf)) >= sizeof(addrbuf))
322 return -1; 322 return -1;
323 323
324 if ((mp = strchr(addrbuf, '/')) != NULL) { 324 if ((mp = strchr(addrbuf, '/')) != NULL) {