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

fix referencing event_data before we test it for null

pull/2077/head
Isaac Connor 2017-12-12 13:30:43 -05:00
parent c40f79097d
commit 6bffc54b77
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_eventstream.cpp
View File

@ -184,7 +184,7 @@ bool EventStream::loadEventData( int event_id ) {
timestamp = atoi(dbrow[1]);
double delta = atof(dbrow[2]);
int id_diff = id - last_id;
double frame_delta = (delta-last_delta)/id_diff;
double frame_delta = id_diff ? (delta-last_delta)/id_diff : 0;
if ( id_diff > 1 ) {
for ( int i = last_id+1; i < id; i++ ) {
event_data->frames[i-1].timestamp = (time_t)(last_timestamp + ((i-last_id)*frame_delta));
@ -755,8 +755,6 @@ void EventStream::runStream() {
checkInitialised();
Debug(3, "frame rate is: (%f)", (double)event_data->frame_count/event_data->duration );
updateFrameRate( (double)event_data->frame_count/event_data->duration );
if ( type == STREAM_JPEG )
fprintf( stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n" );
@ -766,6 +764,9 @@ void EventStream::runStream() {
exit( 0 );
}
Debug(3, "frame rate is: (%f)", (double)event_data->frame_count/event_data->duration );
updateFrameRate( (double)event_data->frame_count/event_data->duration );
while( !zm_terminate ) {
gettimeofday( &now, NULL );