mirror of
https://github.com/openwrt/telephony.git
synced 2025-05-02 11:21:05 +08:00
ac4ad7f6fc
Backport merged patch and move package to PCRE2 as PCRE is EOL and won't receive any security updates anymore. Additional patch are backported to minimize changes to the backport patches. Only patch 010 required adaptation due to a fix backported in 5.7 in the same place where the patch fixed some whitespace issue. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 5c7de00bc0826cf739577010ba7b4882e83819cc Mon Sep 17 00:00:00 2001
|
|
From: Victor Seva <linuxmaniac@torreviejawireless.org>
|
|
Date: Wed, 9 Aug 2023 10:52:47 +0000
|
|
Subject: [PATCH] regex: convert to memory error logging helper
|
|
|
|
---
|
|
src/modules/regex/regex_mod.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/src/modules/regex/regex_mod.c
|
|
+++ b/src/modules/regex/regex_mod.c
|
|
@@ -198,13 +198,13 @@ static int mod_init(void)
|
|
|
|
/* Pointer to pcres */
|
|
if((pcres_addr = shm_malloc(sizeof(pcre **))) == 0) {
|
|
- LM_ERR("no memory for pcres_addr\n");
|
|
+ SHM_MEM_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
/* Integer containing the number of pcres */
|
|
if((num_pcres = shm_malloc(sizeof(int))) == 0) {
|
|
- LM_ERR("no memory for num_pcres\n");
|
|
+ SHM_MEM_ERROR;
|
|
goto err;
|
|
}
|
|
|
|
@@ -425,14 +425,14 @@ static int load_pcres(int action)
|
|
shm_free(pcres);
|
|
}
|
|
if((pcres = shm_malloc(sizeof(pcre *) * num_pcres_tmp)) == 0) {
|
|
- LM_ERR("no more memory for pcres\n");
|
|
+ SHM_MEM_ERROR;
|
|
goto err;
|
|
}
|
|
memset(pcres, 0, sizeof(pcre *) * num_pcres_tmp);
|
|
for(i = 0; i < num_pcres_tmp; i++) {
|
|
pcre_rc = pcre_fullinfo(pcres_tmp[i], NULL, PCRE_INFO_SIZE, &pcre_size);
|
|
if((pcres[i] = shm_malloc(pcre_size)) == 0) {
|
|
- LM_ERR("no more memory for pcres[%i]\n", i);
|
|
+ SHM_MEM_ERROR;
|
|
goto err;
|
|
}
|
|
memcpy(pcres[i], pcres_tmp[i], pcre_size);
|