mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-19 06:18:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup MOnitor destructor. Most of the freeing is done in disconnect now. Fixes zms crash

Browse Source
This commit is contained in:
Isaac Connor
2020-11-19 16:39:14 -05:00
parent 3f1e7e793f
commit 03f033cf36
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/zm_monitor.cpp
View File

@@ -774,34 +774,20 @@ Monitor::~Monitor() {
}
}
if ( (deinterlacing & 0xff) == 4) {
delete next_buffer.image;
delete next_buffer.timestamp;
}
for ( int i = 0; i < image_buffer_count; i++ ) {
delete image_buffer[i].image;
}
delete[] image_buffer;
} // end if mem_ptr
if ( mem_ptr ) {
if ( purpose == ANALYSIS ) {
shared_data->state = state = IDLE;
shared_data->last_read_index = image_buffer_count;
shared_data->last_read_time = 0;
if ( analysis_fps ) {
for ( int i = 0; i < pre_event_buffer_count; i++ ) {
delete pre_event_buffer[i].image;
delete pre_event_buffer[i].timestamp;
}
delete[] pre_event_buffer;
}
if ( Event::PreAlarmCount() )
Event::EmptyPreAlarmFrames();
} else if ( purpose == CAPTURE ) {
shared_data->valid = false;
memset(mem_ptr, 0, mem_size);
if ( (deinterlacing & 0xff) == 4 ) {
delete next_buffer.image;
delete next_buffer.timestamp;
}
}
disconnect();
} // end if mem_ptr