From 174cd739dbb1358ab012c4779e42e0221bef835c Mon Sep 17 00:00:00 2001 From: Toni Date: Sun, 18 Sep 2022 12:40:49 +0200 Subject: Fix warnings on OpenWrt CCs, caused by the memcpy builtin. (#1741) In file included from ../include/ndpi_includes.h:31, from ../include/ndpi_main.h:27, from ../include/ndpi_api.h:28, from protocols/quic.c:27: In function 'memcpy', inlined from 'tls13_hkdf_expand_label_context' at protocols/quic.c:473:5, inlined from 'tls13_hkdf_expand_label' at protocols/quic.c:498:10, inlined from 'quic_hkdf_expand_label.constprop' at protocols/quic.c:512:6: /home/build/openwrt/staging_dir/toolchain-mips_24kc_gcc-11.3.0_musl/include/fortify/string.h:53:16: error: argument 2 null where non-null expected [-Werror=nonnull] 53 | return __builtin_memcpy(__od, __os, __n); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ protocols/quic.c: In function 'quic_hkdf_expand_label.constprop': /home/build/openwrt/staging_dir/toolchain-mips_24kc_gcc-11.3.0_musl/include/fortify/string.h:53:16: note: in a call to built-in function '__builtin_memcpy' Signed-off-by: Toni Uhlig Signed-off-by: Toni Uhlig --- src/lib/protocols/quic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/protocols') diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c index 7889dad4d..4909846b1 100644 --- a/src/lib/protocols/quic.c +++ b/src/lib/protocols/quic.c @@ -469,7 +469,7 @@ static int tls13_hkdf_expand_label_context(struct ndpi_detection_module_struct * memcpy(&info_data[info_len], &context_length, 1); info_len += 1; - if(context_length) { + if(context_length && context_hash != NULL) { memcpy(&info_data[info_len], context_hash, context_length); info_len += context_length; } -- cgit v1.2.3