ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix zms crash due to buffer_copy_size never being initialized

This commit is contained in:
Isaac Connor 2015-01-29 15:32:50 -05:00
parent 2328ae8792
commit 9d636ad128
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_mpeg.cpp
View File

@ -391,6 +391,9 @@ void VideoStream::OpenStream( )
// TODO: Make buffer dynamic. // TODO: Make buffer dynamic.
video_outbuf_size = 4000000; video_outbuf_size = 4000000;
video_outbuf = (uint8_t *)malloc( video_outbuf_size ); video_outbuf = (uint8_t *)malloc( video_outbuf_size );
if ( video_outbuf == NULL ) {
Fatal("Unable to malloc memory for outbuf");
}
} }
#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 100, 1) #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 100, 1)
@ -417,6 +420,7 @@ VideoStream::VideoStream( const char *in_filename, const char *in_format, int bi
last_pts( -1 ), last_pts( -1 ),
streaming_thread(0), streaming_thread(0),
do_streaming(true), do_streaming(true),
buffer_copy_size(0),
buffer_copy(NULL), buffer_copy(NULL),
buffer_copy_lock(new pthread_mutex_t), buffer_copy_lock(new pthread_mutex_t),
buffer_copy_used(0), buffer_copy_used(0),