From: Paul Mackerras <paulus@samba.org>
Date: Thu, 10 Aug 1995 06:54:20 +0000 (+0000)
Subject: Fix infinite loop on big packets; cleanup.
X-Git-Tag: RELEASE_2_3_6~629
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=70af02f3c54ba0ad45fe62e10ee7b71050b55c7b

Fix infinite loop on big packets; cleanup.
---

diff --git a/svr4/ppp_ahdlc.c b/svr4/ppp_ahdlc.c
index dc35dda..790cbf9 100644
--- a/svr4/ppp_ahdlc.c
+++ b/svr4/ppp_ahdlc.c
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp_ahdlc.c,v 1.3 1995/05/29 06:45:49 paulus Exp $
+ * $Id: ppp_ahdlc.c,v 1.4 1995/08/10 06:54:20 paulus Exp $
  */
 
 /*
@@ -566,6 +566,17 @@ static unsigned paritytab[8] = {
     0x69969669, 0x96696996, 0x96696996, 0x69969669
 };
 
+#define UPDATE_FLAGS(c)	{				\
+    if ((c) & 0x80)					\
+	state->flags |= RCV_B7_1;			\
+    else						\
+	state->flags |= RCV_B7_0;			\
+    if (paritytab[(c) >> 5] & (1 << ((c) & 0x1F)))	\
+	state->flags |= RCV_ODDP;			\
+    else						\
+	state->flags |= RCV_EVNP;			\
+}
+
 /*
  * Process received characters.
  */
@@ -616,26 +627,18 @@ unstuff_chars(q, mp)
 		if (c == PPP_FLAG)
 		    break;
 		++cp;
-		if (c & 0x80)
-		    state->flags |= RCV_B7_1;
-		else
-		    state->flags |= RCV_B7_0;
-		if (paritytab[c >> 5] & (1 << (c & 0x1F)))
-		    state->flags |= RCV_ODDP;
-		else
-		    state->flags |= RCV_EVNP;
+		UPDATE_FLAGS(c);
 		if (c == PPP_ESCAPE) {
 		    if (extra > 0) {
 			--extra;
 			++cpend;
-		    } else if (cp >= cpend) {
+		    }
+		    if (cp >= cpend || (c = *cp) == PPP_FLAG) {
 			state->flags |= ESCAPED;
 			break;
 		    }
-		    c = *cp;
-		    if (c == PPP_FLAG)
-			break;
 		    ++cp;
+		    UPDATE_FLAGS(c);
 		    c ^= PPP_TRANS;
 		}
 		*dp++ = c;
@@ -644,19 +647,12 @@ unstuff_chars(q, mp)
 	    state->inlen += dp - dp0;
 	    state->infcs = fcs;
 	    om->b_wptr = dp;
-	    if (cp >= cpend)
-		continue;	/* go back and check cp again */
+	    if (cp >= mp->b_wptr)
+		continue;	/* advance to the next mblk */
 	}
 
 	c = *cp++;
-	if (c & 0x80)
-	    state->flags |= RCV_B7_1;
-	else
-	    state->flags |= RCV_B7_0;
-	if (paritytab[c >> 5] & (1 << (c & 0x1F)))
-	    state->flags |= RCV_ODDP;
-	else
-	    state->flags |= RCV_EVNP;
+	UPDATE_FLAGS(c);
 	if (c == PPP_FLAG) {
 	    /*
 	     * End of a frame.