Merge pull request #8451 from korjaa/fix_possible_filebase_deadlock

Cruz Monrreal · web-flow · commit 1a6d2f6513e2 · 2018-10-17T17:40:29.000-05:00
Added missing _mutex-&gt;unlock() to FileBase::lookup().
diff --git a/platform/FileBase.cpp b/platform/FileBase.cpp
@@ -88,6 +88,7 @@ FileBase *FileBase::lookup(const char *name, unsigned int len)
         p = p->_next;
     }
     if (len == (sizeof "default") - 1 && std::memcmp("default", name, len) == 0) {
+        _mutex->unlock();
         return _default;
     }
     _mutex->unlock();

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ FileBase FileBase::lookup(const char name, unsigned int len)`
`88`	`88`	`p = p->_next;`
`89`	`89`	`}`
`90`	`90`	`if (len == (sizeof "default") - 1 && std::memcmp("default", name, len) == 0) {`
	`91`	`+ _mutex->unlock();`
`91`	`92`	`return _default;`
`92`	`93`	`}`
`93`	`94`	`_mutex->unlock();`