octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-06-01 16:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added exclusive control of statc variables in s3fs xml parser

Browse Source
This commit is contained in:
Takeshi Nakatani 2021-10-26 12:59:57 +00:00 committed by Andrew Gaul
parent 78126aea0b
commit 7273d561f5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/s3fs_xml.cpp
View File

@ -42,15 +42,19 @@ static pthread_mutex_t* pxml_parser_mutex = NULL;
//-------------------------------------------------------------------
static bool GetXmlNsUrl(xmlDocPtr doc, std::string& nsurl)
{
static time_t tmLast = 0; // cache for 60 sec.
static std::string strNs;
bool result = false;
if(!pxml_parser_mutex || !doc){
return false;
return result;
}
if((tmLast + 60) < time(NULL)){
std::string tmpNs;
{
static time_t tmLast = 0; // cache for 60 sec.
static std::string strNs;
AutoLock lock(pxml_parser_mutex);
if((tmLast + 60) < time(NULL)){
// refresh
tmLast = time(NULL);
@ -62,16 +66,17 @@ static bool GetXmlNsUrl(xmlDocPtr doc, std::string& nsurl)
if(nslist[0] && nslist[0]->href){
int len = xmlStrlen(nslist[0]->href);
if(0 < len){
strNs = std::string((const char*)(nslist[0]->href), len);
strNs = std::string((const char*)(nslist[0]->href), len);
}
}
S3FS_XMLFREE(nslist);
}
}
}
tmpNs = strNs;
}
if(!strNs.empty()){
nsurl = strNs;
if(!tmpNs.empty()){
nsurl = tmpNs;
result = true;
}
return result;