[vlc-commits] commit: dvdnav: no need to check for 6 bytes before ps_pkt_size() anymore ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 10 12:51:20 2010 +0300| [e84cbe563bfd63336cdcbe9e2d945074d79f8a69] | committer: Rémi Denis-Courmont 

dvdnav: no need to check for 6 bytes before ps_pkt_size() anymore

This mostly reverts commit 8a497301054ccc2d9d470ade60264036d43e3fc0.

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

 modules/access/dvdnav.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 3cbdceb..57323b5 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1153,9 +1153,8 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *pkt, int i_pkt )
     demux_sys_t *p_sys = p_demux->p_sys;
     const uint8_t     *p = pkt;
 
-    while( (p - pkt) <= (i_pkt - 6) )
+    while( p < &pkt[i_pkt] )
     {
-        /* ps_pkt_size() needs at least 6 bytes */
         int i_size = ps_pkt_size( p, &pkt[i_pkt] - p );
         if( i_size <= 0 )
         {