fixed bug #36388 (PPP: checksum-only in last pbuf leads to pbuf with zero length)

diff --git a/CHANGELOG b/CHANGELOG
index a38f5eb8cd9d9fe72c8e452924024475e5c9f1d4..404798ca009950cf81e1d40d3d3834e3837deffa 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -80,6 +80,10 @@ HISTORY
 
  ++ Bugfixes:
 
+  2012-05-03: Simon Goldschmidt (patch by David Empson)
+  * ppp.c: fixed bug #36388 (PPP: checksum-only in last pbuf leads to pbuf with
+    zero length)
+
   2012-03-27: Simon Goldschmidt
   * vj.c: fixed bug #35756 header length calculation problem in ppp/vj.c
 

diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 0ba82f054e1bf476fb639dd6ebba6973e63d4bda..d880310e8737612fa78bd7b46367f4634ad2cd8e 100644 (file)
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -1821,7 +1821,7 @@ pppInProc(PPPControlRx *pcrx, u_char *s, int l)
         } else {
           struct pbuf *inp;
           /* Trim off the checksum. */
-          if(pcrx->inTail->len >= 2) {
+          if(pcrx->inTail->len > 2) {
             pcrx->inTail->len -= 2;
 
             pcrx->inTail->tot_len = pcrx->inTail->len;