From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Sat, 23 Oct 1993 01:21:55 +0000 (-0800)
Subject: repair to infinite loop detection algorithm
X-Git-Tag: BSD-4_4_Lite1-Snapshot-Development~1609
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/1d91f40158e8e6ca167190279fc6f70a213a4754

repair to infinite loop detection algorithm

SCCS-vsn: usr.sbin/sendmail/src/parseaddr.c 8.14
---

diff --git a/usr/src/usr.sbin/sendmail/src/parseaddr.c b/usr/src/usr.sbin/sendmail/src/parseaddr.c
index 68a32f429a..0d45d9757b 100644
--- a/usr/src/usr.sbin/sendmail/src/parseaddr.c
+++ b/usr/src/usr.sbin/sendmail/src/parseaddr.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)parseaddr.c	8.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)parseaddr.c	8.14 (Berkeley) %G%";
 #endif /* not lint */
 
 #include "sendmail.h"
@@ -732,6 +732,7 @@ _rewrite(pvp, ruleset)
 	register struct rewrite *rwr;	/* pointer to current rewrite rule */
 	int ruleno;			/* current rule number */
 	int rstat = EX_OK;		/* return status */
+	int loopcount;
 	int subr;			/* subroutine number if >= 0 */
 	bool dolookup;			/* do host aliasing */
 	char *npvp[MAXATOM+1];		/* temporary space for rebuild */
@@ -774,10 +775,9 @@ _rewrite(pvp, ruleset)
 	*/
 
 	ruleno = 1;
+	loopcount = 0;
 	for (rwr = RewriteRules[ruleset]; rwr != NULL; )
 	{
-		int loopcount = 0;
-
 		if (tTd(21, 12))
 		{
 			printf("-----trying rule:");
@@ -1165,6 +1165,7 @@ backup:
 				printf("----- rule fails\n");
 			rwr = rwr->r_next;
 			ruleno++;
+			loopcount = 0;
 			nmatches = 0;
 			continue;
 		}
@@ -1191,6 +1192,7 @@ backup:
 			rvp++;
 			rwr = rwr->r_next;
 			ruleno++;
+			loopcount = 0;
 			nmatches = 0;
 		}
 		else if ((*rp & 0377) == CANONHOST)