From fb0c43164cfa473875c3a9022ffdf1d8f2ea6c5f Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Wed, 18 Oct 2023 13:25:49 +0200 Subject: [PATCH] net-snmp: backport patch fixing memory leak for PCRE2 Backport patch fixing memory leak for PCRE2 present upstream. Fixes: #22428 Signed-off-by: Christian Marangi (cherry picked from commit 9f5036169175d853e2e0c76663f0bc98a8645f85) --- net/net-snmp/Makefile | 2 +- ...ss-interface.c-plug-a-leak-with-pcre.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 net/net-snmp/patches/203-if-mib-data_access-interface.c-plug-a-leak-with-pcre.patch diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 46aa5e2735..1a1194955b 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=net-snmp PKG_VERSION:=5.9.1 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/net-snmp diff --git a/net/net-snmp/patches/203-if-mib-data_access-interface.c-plug-a-leak-with-pcre.patch b/net/net-snmp/patches/203-if-mib-data_access-interface.c-plug-a-leak-with-pcre.patch new file mode 100644 index 0000000000..e2da12f17e --- /dev/null +++ b/net/net-snmp/patches/203-if-mib-data_access-interface.c-plug-a-leak-with-pcre.patch @@ -0,0 +1,30 @@ +From e5aadf1e78c624a8e4147d4b70a7795497a50e73 Mon Sep 17 00:00:00 2001 +From: Niels Baggesen +Date: Mon, 22 May 2023 18:44:36 +0200 +Subject: [PATCH] if-mib/data_access/interface.c: plug a leak with pcre2 + +--- + agent/mibgroup/if-mib/data_access/interface.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/agent/mibgroup/if-mib/data_access/interface.c ++++ b/agent/mibgroup/if-mib/data_access/interface.c +@@ -845,7 +845,7 @@ int netsnmp_access_interface_include(con + { + netsnmp_include_if_list *if_ptr; + #if defined(HAVE_PCRE2_H) +- pcre2_match_data *ndx_match = pcre2_match_data_create(3, NULL); ++ pcre2_match_data *ndx_match; + #elif defined(HAVE_PCRE_H) + int found_ndx[3]; + #endif +@@ -860,6 +860,9 @@ int netsnmp_access_interface_include(con + */ + return TRUE; + ++#if defined(HAVE_PCRE2_H) ++ ndx_match = pcre2_match_data_create(3, NULL); ++#endif + + for (if_ptr = include_list; if_ptr; if_ptr = if_ptr->next) { + #if defined(HAVE_PCRE2_H)