vlc | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Sat Aug 18 19:12:54 2018 +0200| [f2ecfbbfbe39c786d07ba5241e8ad49186573d1d] | committer: Hugo Beauzée-Luyssen
live555: Use new instead of calloc > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f2ecfbbfbe39c786d07ba5241e8ad49186573d1d --- modules/access/live555.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp index 0060c24904..8464eb8dc3 100644 --- a/modules/access/live555.cpp +++ b/modules/access/live555.cpp @@ -342,12 +342,12 @@ static int Open ( vlc_object_t *p_this ) p_demux->pf_demux = Demux; p_demux->pf_control= Control; - p_demux->p_sys = p_sys = (demux_sys_t*)calloc( 1, sizeof( demux_sys_t ) ); + p_demux->p_sys = p_sys = new (std::nothrow)demux_sys_t(); if( !p_sys ) return VLC_ENOMEM; if( vlc_timer_create(&p_sys->timer, TimeoutPrevention, p_demux) ) { - free( p_sys ); + delete p_sys; return VLC_ENOMEM; } @@ -506,7 +506,7 @@ static void Close( vlc_object_t *p_this ) vlc_UrlClean( &p_sys->url ); vlc_mutex_destroy(&p_sys->timeout_mutex); - free( p_sys ); + delete p_sys; } static inline Boolean toBool( bool b ) { return b?True:False; } // silly, no? _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits