don't print null received message, %.0[svq] prints nothing

[ppp.git] / pppd / upap.c

diff --git a/pppd/upap.c b/pppd/upap.c
index c59f0ba1fac30753d9475dd8bc8ba81685f4b261..5354c6cbba678d3511a1a11cc2dd92dfbe8ff3e2 100644 (file)
--- a/pppd/upap.c
+++ b/pppd/upap.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: upap.c,v 1.16 1999/04/28 02:45:44 paulus Exp $";
+static char rcsid[] = "$Id: upap.c,v 1.17 1999/06/24 00:17:48 paulus Exp $";
 #endif
 
 /*
@@ -437,13 +437,15 @@ upap_rauthack(u, inp, id, len)
        return;
     }
     GETCHAR(msglen, inp);
-    len -= sizeof (u_char);
-    if (len < msglen) {
-       UPAPDEBUG(("pap_rauthack: rcvd short packet."));
-       return;
+    if (msglen > 0) {
+       len -= sizeof (u_char);
+       if (len < msglen) {
+           UPAPDEBUG(("pap_rauthack: rcvd short packet."));
+           return;
+       }
+       msg = (char *) inp;
+       PRINTMSG(msg, msglen);
     }
-    msg = (char *) inp;
-    PRINTMSG(msg, msglen);
 
     u->us_clientstate = UPAPCS_OPEN;
 
@@ -475,13 +477,15 @@ upap_rauthnak(u, inp, id, len)
        return;
     }
     GETCHAR(msglen, inp);
-    len -= sizeof (u_char);
-    if (len < msglen) {
-       UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
-       return;
+    if (msglen > 0) {
+       len -= sizeof (u_char);
+       if (len < msglen) {
+           UPAPDEBUG(("pap_rauthnak: rcvd short packet."));
+           return;
+       }
+       msg = (char *) inp;
+       PRINTMSG(msg, msglen);
     }
-    msg = (char *) inp;
-    PRINTMSG(msg, msglen);
 
     u->us_clientstate = UPAPCS_BADAUTH;