github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Return false in SharedFiles::open() when an error happens

Browse Source
This commit is contained in:
Wenfeng Liu 2018-05-24 01:10:01 +00:00 committed by Felipe Zimmerle
parent a02bd3a3b9
commit 45e531236a
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils/shared_files.cc
View File

@ -127,6 +127,7 @@ err_fh:
bool SharedFiles::open(const std::string& fileName, std::string *error) { bool SharedFiles::open(const std::string& fileName, std::string *error) {
std::pair<msc_file_handler *, FILE *> a; std::pair<msc_file_handler *, FILE *> a;
bool ret = true;
#if MODSEC_USE_GENERAL_LOCK #if MODSEC_USE_GENERAL_LOCK
pthread_mutex_lock(m_generalLock); pthread_mutex_lock(m_generalLock);
@ -136,11 +137,13 @@ bool SharedFiles::open(const std::string& fileName, std::string *error) {
if (a.first == NULL) { if (a.first == NULL) {
a = add_new_handler(fileName, error); a = add_new_handler(fileName, error);
if (error->size() > 0) { if (error->size() > 0) {
ret = false;
goto out; goto out;
} }
} }
if (a.first == NULL) { if (a.first == NULL) {
error->assign("Not able to open: " + fileName); error->assign("Not able to open: " + fileName);
ret = false;
goto out; goto out;
} }
@ -149,7 +152,7 @@ out:
pthread_mutex_unlock(m_generalLock); pthread_mutex_unlock(m_generalLock);
#endif #endif
return true; return ret;
} }