mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-07 13:31:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Validate connection counts before decrementing

Browse Source
This commit is contained in:
MrDave
2021-07-03 09:32:36 -06:00
committed by Mr-Dave
parent 555cd3a4d2
commit ce8b90cbac
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/webu.cpp
View File

@@ -961,30 +961,43 @@ static void webu_mhd_deinit(void *cls, struct MHD_Connection *connection
(void)connection;
(void)cls;
(void)toe;
/* Sometimes we can shutdown after we have initiated a connection but yet
* before the connection counter has been incremented. So we check the
* connection counter before we decrement
*/
if (webui->cnct_type == WEBUI_CNCT_FULL ) {
pthread_mutex_lock(&webui->cam->stream.mutex);
webui->cam->stream.norm.cnct_count--;
if (webui->cam->stream.norm.cnct_count > 0) {
webui->cam->stream.norm.cnct_count--;
}
pthread_mutex_unlock(&webui->cam->stream.mutex);
} else if (webui->cnct_type == WEBUI_CNCT_SUB ) {
pthread_mutex_lock(&webui->cam->stream.mutex);
webui->cam->stream.sub.cnct_count--;
if (webui->cam->stream.sub.cnct_count > 0) {
webui->cam->stream.sub.cnct_count--;
}
pthread_mutex_unlock(&webui->cam->stream.mutex);
} else if (webui->cnct_type == WEBUI_CNCT_MOTION ) {
pthread_mutex_lock(&webui->cam->stream.mutex);
webui->cam->stream.motion.cnct_count--;
if (webui->cam->stream.motion.cnct_count > 0) {
webui->cam->stream.motion.cnct_count--;
}
pthread_mutex_unlock(&webui->cam->stream.mutex);
} else if (webui->cnct_type == WEBUI_CNCT_SOURCE ) {
pthread_mutex_lock(&webui->cam->stream.mutex);
webui->cam->stream.source.cnct_count--;
if (webui->cam->stream.source.cnct_count > 0) {
webui->cam->stream.source.cnct_count--;
}
pthread_mutex_unlock(&webui->cam->stream.mutex);
} else if (webui->cnct_type == WEBUI_CNCT_SECONDARY ) {
pthread_mutex_lock(&webui->cam->stream.mutex);
webui->cam->stream.secondary.cnct_count--;
if (webui->cam->stream.secondary.cnct_count > 0) {
webui->cam->stream.secondary.cnct_count--;
}
pthread_mutex_unlock(&webui->cam->stream.mutex);
}