From b85b554db17c1f2edfe2b662aa8a7ba24616ff26 Mon Sep 17 00:00:00 2001 From: chrysn Date: Wed, 16 Sep 2015 16:01:55 +0200 Subject: [PATCH] PPP, FSM, don't call memcpy with NULL even when size = 0 --- src/netif/ppp/fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c index 9237d3d6..d7c51422 100644 --- a/src/netif/ppp/fsm.c +++ b/src/netif/ppp/fsm.c @@ -787,7 +787,7 @@ void fsm_sdata(fsm *f, u_char code, u_char id, const u_char *data, int datalen) } outp = (u_char*)p->payload; -/* if (datalen && data != outp + PPP_HDRLEN + HEADERLEN) -- was only for fsm_sconfreq() */ + if (datalen) /* && data != outp + PPP_HDRLEN + HEADERLEN) -- was only for fsm_sconfreq() */ MEMCPY(outp + PPP_HDRLEN + HEADERLEN, data, datalen); MAKEHEADER(outp, f->protocol); PUTCHAR(code, outp);