RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-16 22:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2012/06/21 00:16:07

Browse Source 
[addrmatch.c]
     fix strlcpy truncation check.  from carsten at debian org, ok markus
This commit is contained in:
Damien Miller 2012-06-30 08:32:29 +10:00
parent 8908da7dce
commit 97f43bbfc9
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
20120629
- OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2012/06/21 00:16:07
[addrmatch.c]
fix strlcpy truncation check. from carsten at debian org, ok markus
20120628 20120628
- (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null - (dtucker) [openbsd-compat/getrrsetbyname-ldns.c] bz #2022: prevent null
pointer deref in the client when built with LDNS and using DNSSEC with a pointer deref in the client when built with LDNS and using DNSSEC with a

4
addrmatch.c
View File

@ -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> * 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)
char addrbuf[64], *mp, *cp; char addrbuf[64], *mp, *cp;
/* Don't modify argument */ /* 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; return -1;
if ((mp = strchr(addrbuf, '/')) != NULL) { if ((mp = strchr(addrbuf, '/')) != NULL) {