vlc/vlc-2.0 | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Sat Mar 10 15:54:43 2012 +0100| [b2eb0df386c5b3a9dbf133ac48773e26a16fe76e] | committer: Jean-Baptiste Kempf
bluray: Check for read error when menu are enabled. This fixes crash with BD-J menu, if libbluray isn't built with java support. (cherry picked from commit 3bc5c401996090ef409d0c76fd59c1d009b80c00) (cherry picked from commit 96b0289176abe5a24eb1f854e74654b3c55d0574) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b2eb0df386c5b3a9dbf133ac48773e26a16fe76e --- modules/access/bluray.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/access/bluray.c b/modules/access/bluray.c index 34f3f4d..6505695 100644 --- a/modules/access/bluray.c +++ b/modules/access/bluray.c @@ -1000,6 +1000,11 @@ static int blurayDemux(demux_t *p_demux) BD_EVENT e; nread = bd_read_ext(p_sys->bluray, p_block->p_buffer, NB_TS_PACKETS * BD_TS_PACKET_SIZE, &e); + if (nread < 0) + { + block_Release(p_block); + return -1; + } if (nread == 0) { if (e.event == BD_EVENT_NONE) msg_Info(p_demux, "We reached the end of a title"); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
