From fc55a36b9318bf9ac946e4e3bd3c88d32b64652c Mon Sep 17 00:00:00 2001
From: Yonggang Luo <
luoyonggang@gmail.com>
Date: Thu, 8 Apr 2021 20:04:27 +0800
Subject: [PATCH] guard when data is NULL
[build] ../../3rd/lwip/src/include/lwip/opt.h:137:41: error: argument 2 null where non-null expected [-Werror=nonnull]
[build] #define MEMCPY(dst,src,len) memcpy(dst,src,len)
[build] ^~~~~~~~~~~~~~~~~~~
[build] ../../3rd/lwip/src/netif/ppp/fsm.c:791:7: note: in expansion of macro 'MEMCPY'
[build] MEMCPY(outp + PPP_HDRLEN + HEADERLEN, data, datalen);
[build] ^~~~~~
[build] In file included from c:\mentorgraphics\fly380s_8910\prebuilts\win32\gcc-arm-none-eabi\arm-none-eabi\include\sys\time.h:40:0,
[build] from ../../3rd/../src/cat1/arch/cc.h:40,
[build] from ../../3rd/lwip/src/include/lwip/arch.h:50,
[build] from ../../3rd/lwip/src/include/lwip/debug.h:40,
[build] from ../../3rd/lwip/src/include/lwip/opt.h:52,
[build] from ../../3rd/lwip/src/include/netif/ppp/ppp_opts.h:31,
[build] from ../../3rd/lwip/src/netif/ppp/fsm.c:43:
[build] c:\mentorgraphics\fly380s_8910\prebuilts\win32\gcc-arm-none-eabi\arm-none-eabi\include\string.h:31:8: note: in a call to function 'memcpy' declared here
[build] _PTR _EXFUN(memcpy,(_PTR __restrict, const _PTR __restrict, size_t));
[build] ^
---
src/netif/ppp/fsm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c
index 2ba1207b..90a227c8 100644
--- a/src/netif/ppp/fsm.c
+++ b/src/netif/ppp/fsm.c
@@ -787,8 +787,9 @@ 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() */
- MEMCPY(outp + PPP_HDRLEN + HEADERLEN, data, datalen);
+ if (datalen && data != NULL) { /* && data != outp + PPP_HDRLEN + HEADERLEN) -- was only for fsm_sconfreq() */
+ MEMCPY(outp + PPP_HDRLEN + HEADERLEN, data, datalen);
+ }
MAKEHEADER(outp, f->protocol);
PUTCHAR(code, outp);
PUTCHAR(id, outp);
--
2.29.2.windows.3
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
0001-guard-when-data-is-NULL.patch