Merge branch 'lr/linux-4.8' of https://github.com/NetworkManager/ppp

[ppp.git] / pppd / utils.c

diff --git a/pppd/utils.c b/pppd/utils.c
index 6cf80fe3d229a2fab28ec00dd4b9149e0e11279f..3ac1b60926d20014808dcaf708d59f6adb33ee1a 100644 (file)
--- a/pppd/utils.c
+++ b/pppd/utils.c
@@ -296,6 +296,8 @@ vslprintf(buf, buflen, fmt, args)
        case 'q':               /* quoted string */
            quoted = c == 'q';
            p = va_arg(args, unsigned char *);
+           if (p == NULL)
+                   p = (unsigned char *)"<NULL>";
            if (fillch == '0' && prec >= 0) {
                n = prec;
            } else {
@@ -623,7 +625,7 @@ print_string(p, len, printer, arg)
                printer(arg, "\\t");
                break;
            default:
-               printer(arg, "\\%.3o", c);
+               printer(arg, "\\%.3o", (unsigned char) c);
            }
        }
     }