From owner-svn-src-all@FreeBSD.ORG  Sun Jul 19 19:01:31 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 448A5106566C;
	Sun, 19 Jul 2009 19:01:31 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 332A38FC1A;
	Sun, 19 Jul 2009 19:01:31 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6JJ1UlN051523;
	Sun, 19 Jul 2009 19:01:30 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6JJ1Um3051521;
	Sun, 19 Jul 2009 19:01:30 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <200907191901.n6JJ1Um3051521@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Sun, 19 Jul 2009 19:01:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195772 - head/usr.sbin/ppp
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jul 2009 19:01:31 -0000

Author: brian
Date: Sun Jul 19 19:01:30 2009
New Revision: 195772
URL: http://svn.freebsd.org/changeset/base/195772

Log:
  Don't get stuck in an infinite loop comparing (short++ <= maxshort)
  
  PR:		136893
  Submitted by:	Aragon Gouveia - aragon at phat dot za dot net (mostly)
  Approved by:	re (kib)
  MFC after:	3 weeks

Modified:
  head/usr.sbin/ppp/nat_cmd.c

Modified: head/usr.sbin/ppp/nat_cmd.c
==============================================================================
--- head/usr.sbin/ppp/nat_cmd.c	Sun Jul 19 18:37:20 2009	(r195771)
+++ head/usr.sbin/ppp/nat_cmd.c	Sun Jul 19 19:01:30 2009	(r195772)
@@ -175,7 +175,7 @@ nat_RedirectPort(struct cmdargs const *a
       return -1;
     }
 
-    while (laliasport <= haliasport) {
+    do {
       link = LibAliasRedirectPort(la, localaddr, htons(llocalport),
 				     remoteaddr, htons(lremoteport),
                                      aliasaddr, htons(laliasport),
@@ -187,10 +187,9 @@ nat_RedirectPort(struct cmdargs const *a
         return 1;
       }
       llocalport++;
-      laliasport++;
       if (hremoteport)
         lremoteport++;
-    }
+    } while (laliasport++ < haliasport);
 
     return 0;
   }