Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly check for overflows. Fixes PR8314 as annotated by mjl.

This commit is contained in:
is 1999-11-13 04:52:50 +00:00
parent 5251ca4af1
commit bcb4c98ba9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libc/net/inet_pton.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: inet_pton.c,v 1.13 1999/11/03 11:47:02 is Exp $ */
/* $NetBSD: inet_pton.c,v 1.14 1999/11/13 04:52:50 is Exp $ */
/* Copyright (c) 1996 by Internet Software Consortium.
*
@ -21,7 +21,7 @@
#if 0
static char rcsid[] = "Id: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp ";
#else
__RCSID("$NetBSD: inet_pton.c,v 1.13 1999/11/03 11:47:02 is Exp $");
__RCSID("$NetBSD: inet_pton.c,v 1.14 1999/11/13 04:52:50 is Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -149,6 +149,7 @@ inet_pton4(src, dst)
* a.b.c.d
* a.b.c (with c treated as 16 bits)
* a.b (with b treated as 24 bits)
* a (with a treated as 32 bits)
*/
if (pp >= parts + 3)
return (0);
@ -176,19 +177,19 @@ inet_pton4(src, dst)
break;
case 2: /* a.b -- 8.24 bits */
if (val > 0xffffff)
if (parts[0] > 0xff || val > 0xffffff)
return (0);
val |= parts[0] << 24;
break;
case 3: /* a.b.c -- 8.8.16 bits */
if (val > 0xffff)
if ((parts[0] | parts[1]) > 0xff || val > 0xffff)
return (0);
val |= (parts[0] << 24) | (parts[1] << 16);
break;
case 4: /* a.b.c.d -- 8.8.8.8 bits */
if (val > 0xff)
if ((parts[0] | parts[1] | parts[2] | val) > 0xff)
return (0);
val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
break;