xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: regex crashes on windows

This commit is contained in:
xsren 2024-08-28 14:12:19 +08:00
parent c61a96656e
commit 475c30611b
1 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/util/src/tcompare.c
View File

@ -1253,6 +1253,9 @@ void regexCacheFree(void *ppUsingRegex) {
} }
int32_t InitRegexCache() { int32_t InitRegexCache() {
#ifdef WINDOWS
return 0;
#endif
sRegexCache.regexHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK); sRegexCache.regexHash = taosHashInit(64, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_ENTRY_LOCK);
if (sRegexCache.regexHash == NULL) { if (sRegexCache.regexHash == NULL) {
uError("failed to create RegexCache"); uError("failed to create RegexCache");
@ -1277,6 +1280,9 @@ int32_t InitRegexCache() {
} }
void DestroyRegexCache(){ void DestroyRegexCache(){
#ifdef WINDOWS
return;
#endif
int32_t code = 0; int32_t code = 0;
uInfo("[regex cache] destory regex cache"); uInfo("[regex cache] destory regex cache");
(void)taosTmrStopA(&sRegexCache.timer); (void)taosTmrStopA(&sRegexCache.timer);
@ -1359,6 +1365,46 @@ void releaseRegComp(UsingRegex **regex){
static threadlocal UsingRegex ** ppUsingRegex; static threadlocal UsingRegex ** ppUsingRegex;
static threadlocal regex_t * pRegex; static threadlocal regex_t * pRegex;
static threadlocal char *pOldPattern = NULL; static threadlocal char *pOldPattern = NULL;
#ifdef WINDOWS
static threadlocal regex_t gRegex;
void DestoryThreadLocalRegComp() {
if (NULL != pOldPattern) {
regfree(&gRegex);
taosMemoryFree(pOldPattern);
pOldPattern = NULL;
}
}
int32_t threadGetRegComp(regex_t **regex, const char *pPattern) {
if (NULL != pOldPattern) {
if (strcmp(pOldPattern, pPattern) == 0) {
*regex = &gRegex;
return 0;
} else {
DestoryThreadLocalRegComp();
}
}
pOldPattern = taosStrdup(pPattern);
if (NULL == pOldPattern) {
uError("Failed to Malloc when compile regex pattern %s.", pPattern);
return terrno;
}
int32_t cflags = REG_EXTENDED;
int32_t ret = regcomp(&gRegex, pPattern, cflags);
if (ret != 0) {
char msgbuf[256] = {0};
(void)regerror(ret, &gRegex, msgbuf, tListLen(msgbuf));
uError("Failed to compile regex pattern %s. reason %s", pPattern, msgbuf);
taosMemoryFree(pOldPattern);
pOldPattern = NULL;
return TSDB_CODE_PAR_REGULAR_EXPRESSION_ERROR;
}
*regex = &gRegex;
return 0;
}
#else
void DestoryThreadLocalRegComp() { void DestoryThreadLocalRegComp() {
if (NULL != pOldPattern) { if (NULL != pOldPattern) {
releaseRegComp(ppUsingRegex); releaseRegComp(ppUsingRegex);
@ -1390,10 +1436,11 @@ int32_t threadGetRegComp(regex_t **regex, const char *pPattern) {
return terrno; return terrno;
} }
ppUsingRegex = ppRegex; ppUsingRegex = ppRegex;
pRegex = &((*ppUsingRegex)->pRegex); pRegex = &((*ppUsingRegex)->pRegex);
*regex = &(*ppRegex)->pRegex; *regex = &(*ppRegex)->pRegex;
return 0; return 0;
} }
#endif
static int32_t doExecRegexMatch(const char *pString, const char *pPattern) { static int32_t doExecRegexMatch(const char *pString, const char *pPattern) {
int32_t ret = 0; int32_t ret = 0;