[vlc-commits] demux: nuv: remove abort() on realloc failure

Francois Cartegnie git at videolan.org
Wed Jul 20 16:25:03 CEST 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 20 15:11:26 2016 +0200| [1827fda694827738b991a131389078e8463ec304] | committer: Francois Cartegnie

demux: nuv: remove abort() on realloc failure

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1827fda694827738b991a131389078e8463ec304
---

 modules/demux/nuv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 1edc1fd..45fa407 100644
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -419,7 +419,7 @@ static int Demux( demux_t *p_demux )
             /* for rtjpeg data, the header is also needed */
             p_data = block_Realloc( p_data, NUV_FH_SIZE, fh.i_length );
             if( unlikely(!p_data) )
-                abort();
+                return VLC_DEMUXER_EGENERIC;
             memcpy( p_data->p_buffer, p_sys->fh_buffer, NUV_FH_SIZE );
         }
         /* 0,1,2,3 -> rtjpeg, >=4 mpeg4 */



More information about the vlc-commits mailing list