[continued from previous message]

+ pcre2_code_free(msdos_re);

return 1;
}
+ pcre2_match_data_free(md);
+ pcre2_code_free(unix_re);
+ pcre2_code_free(netware_re);
+ pcre2_code_free(netpresenz_re);
+ pcre2_code_free(eplf_re);
+ pcre2_code_free(multinet_re);
+ pcre2_code_free(msdos_re);

return 0;
}
--- kodi-20.2+dfsg.orig/xbmc/utils/RegExp.cpp
+++ kodi-20.2+dfsg/xbmc/utils/RegExp.cpp
@@ -16,27 +16,6 @@
#include <stdlib.h>
#include <string.h>

-using namespace PCRE;
-
-#ifndef PCRE_UCP
-#define PCRE_UCP 0
-#endif // PCRE_UCP
-
-#ifdef PCRE_CONFIG_JIT
-#define PCRE_HAS_JIT_CODE 1
-#endif
-
-#ifndef PCRE_STUDY_JIT_COMPILE
-#define PCRE_STUDY_JIT_COMPILE 0
-#endif
-#ifndef PCRE_INFO_JIT
-// some unused number
-#define PCRE_INFO_JIT 2048
-#endif
-#ifndef PCRE_HAS_JIT_CODE
-#define pcre_free_study(x) pcre_free((x))
-#endif
-
int CRegExp::m_Utf8Supported = -1;
int CRegExp::m_UcpSupported = -1;
int CRegExp::m_JitSupported = -1;
@@ -51,25 +30,24 @@
{
m_utf8Mode = utf8;
m_re = NULL;
- m_sd = NULL;
- m_iOptions = PCRE_DOTALL | PCRE_NEWLINE_ANY;
+ m_ctxt = NULL;
+ m_iOptions = PCRE2_DOTALL;
if(caseless)
- m_iOptions |= PCRE_CASELESS;
+ m_iOptions |= PCRE2_CASELESS;
if (m_utf8Mode == forceUtf8)
{
if (Is