summaryrefslogtreecommitdiffstats
path: root/modules/regex
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-12-23 11:32:48 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-06-12 15:12:15 +0200
commite289cf7085f0edda5e5ea253be6806a08abb4777 (patch)
treec6bce73a626dbabebc16135947f37f05c8fcef97 /modules/regex
parent2d6b880987bc600cda586b281fcbe26791e92e09 (diff)
downloadredot-engine-e289cf7085f0edda5e5ea253be6806a08abb4777.tar.gz
pcre2: Update to upstream version 10.42 (take two)
Changelog: https://github.com/PCRE2Project/pcre2/blob/pcre2-10.42/ChangeLog This fixes support for RISC-V architectures in the sljit library, so we enable the module's compilation for `rv64` too.
Diffstat (limited to 'modules/regex')
-rw-r--r--modules/regex/config.py2
-rw-r--r--modules/regex/regex.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/regex/config.py b/modules/regex/config.py
index 1248a8374d..df9f44cb95 100644
--- a/modules/regex/config.py
+++ b/modules/regex/config.py
@@ -1,5 +1,5 @@
def can_build(env, platform):
- return not env["arch"].startswith("rv")
+ return True
def configure(env):
diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp
index 999a61e11a..8d1e92b4e3 100644
--- a/modules/regex/regex.cpp
+++ b/modules/regex/regex.cpp
@@ -40,7 +40,9 @@ static void *_regex_malloc(PCRE2_SIZE size, void *user) {
}
static void _regex_free(void *ptr, void *user) {
- memfree(ptr);
+ if (ptr) {
+ memfree(ptr);
+ }
}
int RegExMatch::_find(const Variant &p_name) const {