reduce diffs with other copies of this code.

This commit is contained in:
christos 2014-03-07 01:07:01 +00:00
parent 4044532ae0
commit 9669e36fb7
1 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ns_name.c,v 1.10 2014/03/07 01:00:58 christos Exp $ */
/* $NetBSD: ns_name.c,v 1.11 2014/03/07 01:07:01 christos Exp $ */
/*
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = "Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp";
#else
__RCSID("$NetBSD: ns_name.c,v 1.10 2014/03/07 01:00:58 christos Exp $");
__RCSID("$NetBSD: ns_name.c,v 1.11 2014/03/07 01:07:01 christos Exp $");
#endif
#endif
@ -473,12 +473,12 @@ ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
_DIAGASSERT(__type_fit(int, srcp - src + 1));
len = (int)(srcp - src + 1);
}
l = ((n & 0x3f) << 8) | (*srcp & 0xff);
if (l >= eom - msg) { /*%< Out of range. */
n = ((n & 0x3f) << 8) | (*srcp & 0xff);
if (n >= eom - msg) { /*%< Out of range. */
errno = EMSGSIZE;
return (-1);
}
srcp = msg + l;
srcp = msg + n;
checked += 2;
/*
* Check for loops in the compressed name;