diff options
| author |   dtucker <dtucker@openbsd.org> | 2012-06-21 00:16:07 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2012-06-21 00:16:07 +0000 |
| commit | 0a66b51efa21cb607fd9599e4d76681ed6e83563 (patch) | |
| tree | fc32de52a54e27fd8608a54b9019c91cd7f144d1 | |
| parent | Corrent and expand passwd(5) HISTORY, (diff) | |
| download | wireguard-openbsd-0a66b51efa21cb607fd9599e4d76681ed6e83563.tar.xz wireguard-openbsd-0a66b51efa21cb607fd9599e4d76681ed6e83563.zip | |
fix strlcpy truncation check. from carsten at debian org, ok markus
| -rw-r--r-- | usr.bin/ssh/addrmatch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/addrmatch.c b/usr.bin/ssh/addrmatch.c index 3c0953827c8..e5b1e697c86 100644 --- a/usr.bin/ssh/addrmatch.c +++ b/usr.bin/ssh/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 <djm@mindrot.org> @@ -314,7 +314,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) { |