PPP, FSM, don't call memcpy with NULL even when size = 0

This commit is contained in:
chrysn 2015-09-16 16:01:55 +02:00 committed by Sylvain Rochet
parent dc04118469
commit b85b554db1

View File

@ -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; 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); MEMCPY(outp + PPP_HDRLEN + HEADERLEN, data, datalen);
MAKEHEADER(outp, f->protocol); MAKEHEADER(outp, f->protocol);
PUTCHAR(code, outp); PUTCHAR(code, outp);