diff --git a/pkg/ccn-lite/Makefile b/pkg/ccn-lite/Makefile index 75dbdecd90..29523a147c 100644 --- a/pkg/ccn-lite/Makefile +++ b/pkg/ccn-lite/Makefile @@ -1,6 +1,6 @@ PKG_NAME=ccn-lite PKG_URL=https://github.com/cn-uofbasel/ccn-lite/ -PKG_VERSION=da0d9de8d82349dff845acc62d37242dd09b3d3d +PKG_VERSION=0aa974b0efdaabc61df95f35af5f74f5ed148aa8 PKG_LICENSE=ISC include $(RIOTBASE)/pkg/pkg.mk diff --git a/pkg/ccn-lite/patches/0006-src-ccnl-core-src-ccnl-relay.c-fix-use-after-free.patch b/pkg/ccn-lite/patches/0006-src-ccnl-core-src-ccnl-relay.c-fix-use-after-free.patch deleted file mode 100644 index 76bb65dae5..0000000000 --- a/pkg/ccn-lite/patches/0006-src-ccnl-core-src-ccnl-relay.c-fix-use-after-free.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f18b92a5c826d13e8138b4c5e5c9393f26382a69 Mon Sep 17 00:00:00 2001 -From: Marian Buschsieweke -Date: Fri, 11 Nov 2022 22:14:49 +0100 -Subject: [PATCH] src/ccnl-core/src/ccnl-relay.c: fix use after free - -This fixes compilation with GCC >= 12.x, which previously failed with - - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c: In function 'ccnl_fib_rem_entry': - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c:916:16: error: pointer 'fwd' used after 'free' [-Werror=use-after-free] - 916 | if (fwd->face) { - | ~~~^~~~~~ - In file included from /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c:33: - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/../ccnl-riot/include/ccn-lite-riot.h:52:41: note: call to 'free' here - 52 | #define ccnl_free(p) free(p) - | ^~~~~~~ - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c:910:13: note: in expansion of macro 'ccnl_free' - 910 | ccnl_free(fwd); - | ^~~~~~~~~ - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c: In function 'ccnl_fib_rem_entry': - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c:916:16: error: pointer 'fwd' used after 'free' [-Werror=use-after-free] - 916 | if (fwd->face) { - | ~~~^~~~~~ - In file included from /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c:33: - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-riot/include/ccn-lite-riot.h:52:41: note: call to free' here - 52 | #define ccnl_free(p) free(p) - | ^~~~~~~ - /home/maribu/Repos/software/RIOT/build/pkg/ccn-lite/src/ccnl-core/src/ccnl-relay.c:910:13: note: in expansion of macro 'ccnl_free' - 910 | ccnl_free(fwd); - | ^~~~~~~~~ ---- - src/ccnl-core/src/ccnl-relay.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ccnl-core/src/ccnl-relay.c b/src/ccnl-core/src/ccnl-relay.c -index 05e1990..88c05dc 100644 ---- a/src/ccnl-core/src/ccnl-relay.c -+++ b/src/ccnl-core/src/ccnl-relay.c -@@ -908,7 +908,7 @@ ccnl_fib_rem_entry(struct ccnl_relay_s *relay, struct ccnl_prefix_s *pfx, - } - ccnl_prefix_free(fwd->prefix); - ccnl_free(fwd); -- break; -+ return res; - } - } - --- -2.38.1 -