[vlc-devel] commit: TS demux: Clarify a for() loop. (Derk-Jan Hartman )

git version control git at videolan.org
Fri Oct 10 17:23:21 CEST 2008


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Fri Oct 10 17:20:01 2008 +0200| [87b1084c0914a4374ab0831f3227dacd4f8f8c88] | committer: Derk-Jan Hartman 

TS demux: Clarify a for() loop.

This will likely fix CID 247, which seems like a false.
I don't see how PIDClean is called twice here, I think it's a limitation in the Coverity scan logic.

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

 modules/demux/ts.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 3c003eb..92889d6 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -4021,7 +4021,7 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
 
             if( !pid->b_valid || pid->psi ) continue;
 
-            for( j = 0; j < i_pmt_rm; j++ )
+            for( j = 0; j < i_pmt_rm && pid->b_valid; j++ )
             {
                 int i_prg;
                 for( i_prg = 0; i_prg < pid->p_owner->i_prg; i_prg++ )
@@ -4041,8 +4041,6 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
                     PIDClean( p_demux->out, pid );
                     break;
                 }
-
-                if( !pid->b_valid ) break;
             }
         }
 




More information about the vlc-devel mailing list