From owner-p4-projects@FreeBSD.ORG  Thu Jul 28 15:44:35 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5CDC516A420; Thu, 28 Jul 2005 15:44:35 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 30E2C16A421
	for <perforce@freebsd.org>; Thu, 28 Jul 2005 15:44:35 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1D5C343D5F
	for <perforce@freebsd.org>; Thu, 28 Jul 2005 15:44:34 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6SFiX94060912
	for <perforce@freebsd.org>; Thu, 28 Jul 2005 15:44:33 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6SFiX8a060909
	for perforce@freebsd.org; Thu, 28 Jul 2005 15:44:33 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 28 Jul 2005 15:44:33 GMT
Message-Id: <200507281544.j6SFiX8a060909@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81122 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jul 2005 15:44:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=81122

Change 81122 by sam@sam_ebb on 2005/07/28 15:43:56

	sync with head

Affected files ...

.. //depot/projects/wifi/sbin/dhclient/options.c#3 edit

Differences ...

==== //depot/projects/wifi/sbin/dhclient/options.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.14 2004/11/02 01:18:45 deraadt Exp $	*/
+/*	$OpenBSD: options.c,v 1.15 2004/12/26 03:17:07 deraadt Exp $	*/
 
 /* DHCP options parsing and reassembly. */
 
@@ -600,7 +600,7 @@
 			case 'l':
 				opcount = snprintf(op, opleft, "%ld",
 				    (long)getLong(dp));
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				dp += 4;
@@ -608,7 +608,7 @@
 			case 'L':
 				opcount = snprintf(op, opleft, "%ld",
 				    (unsigned long)getULong(dp));
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				dp += 4;
@@ -616,7 +616,7 @@
 			case 's':
 				opcount = snprintf(op, opleft, "%d",
 				    getShort(dp));
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				dp += 2;
@@ -624,7 +624,7 @@
 			case 'S':
 				opcount = snprintf(op, opleft, "%d",
 				    getUShort(dp));
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				dp += 2;
@@ -632,19 +632,19 @@
 			case 'b':
 				opcount = snprintf(op, opleft, "%d",
 				    *(char *)dp++);
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				break;
 			case 'B':
 				opcount = snprintf(op, opleft, "%d", *dp++);
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				break;
 			case 'x':
 				opcount = snprintf(op, opleft, "%x", *dp++);
-				if (opcount >= opleft)
+				if (opcount >= opleft || opcount == -1)
 					goto toobig;
 				opleft -= opcount;
 				break;