From 97f43bbfc9be102ca285af28afc288d90afa6712 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 30 Jun 2012 08:32:29 +1000 Subject: - dtucker@cvs.openbsd.org 2012/06/21 00:16:07 [addrmatch.c] fix strlcpy truncation check. from carsten at debian org, ok markus --- addrmatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addrmatch.c') diff --git a/addrmatch.c b/addrmatch.c index 5b6773cce..388603cae 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.5 2010/02/26 20:29:54 djm Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.6 2012/06/21 00:16:07 dtucker Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller @@ -318,7 +318,7 @@ addr_pton_cidr(const char *p, struct xaddr *n, u_int *l) char addrbuf[64], *mp, *cp; /* Don't modify argument */ - if (p == NULL || strlcpy(addrbuf, p, sizeof(addrbuf)) > sizeof(addrbuf)) + if (p == NULL || strlcpy(addrbuf, p, sizeof(addrbuf)) >= sizeof(addrbuf)) return -1; if ((mp = strchr(addrbuf, '/')) != NULL) { -- cgit v1.2.3