svn commit: r196088 - stable/7/usr.sbin/ppp

[Brian Somers]

Author: brian
Date: Sun Aug  9 18:39:23 2009
New Revision: 196088
URL: http://svn.freebsd.org/changeset/base/196088

Log:
  MFC: 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)

Modified:
  stable/7/usr.sbin/ppp/   (props changed)
  stable/7/usr.sbin/ppp/nat_cmd.c

Modified: stable/7/usr.sbin/ppp/nat_cmd.c
==============================================================================
--- stable/7/usr.sbin/ppp/nat_cmd.c	Sun Aug  9 11:47:39 2009	(r196087)
+++ stable/7/usr.sbin/ppp/nat_cmd.c	Sun Aug  9 18:39:23 2009	(r196088)
@@ -173,7 +173,7 @@ nat_RedirectPort(struct cmdargs const *a
       return -1;
     }
 
-    while (laliasport <= haliasport) {
+    do {
       link = PacketAliasRedirectPort(localaddr, htons(llocalport),
 				     remoteaddr, htons(lremoteport),
                                      aliasaddr, htons(laliasport),
@@ -185,10 +185,9 @@ nat_RedirectPort(struct cmdargs const *a
         return 1;
       }
       llocalport++;
-      laliasport++;
       if (hremoteport)
         lremoteport++;
-    }
+    } while (laliasport++ < haliasport);
 
     return 0;
   }