ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix memleak when connect fails

pull/3195/head
Isaac Connor 2021-03-16 13:28:00 -04:00
parent 028f2dd626
commit c0242e7369
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zm_stream.cpp
View File

@ -40,7 +40,7 @@ StreamBase::~StreamBase() {
bool StreamBase::loadMonitor(int p_monitor_id) {
monitor_id = p_monitor_id;
if ( !(monitor = Monitor::Load(monitor_id, false, Monitor::QUERY)) ) {
if ( !(monitor or (monitor = Monitor::Load(monitor_id, false, Monitor::QUERY))) ) {
Error("Unable to load monitor id %d for streaming", monitor_id);
return false;
}
@ -52,6 +52,7 @@ bool StreamBase::loadMonitor(int p_monitor_id) {
if ( !monitor->connect() ) {
Error("Unable to connect to monitor id %d for streaming", monitor_id);
monitor->disconnect();
return false;
}