Bug fix: le buffer p_pes_header_save du pes n'etait jamais alloue, ce qui

fait que la fonction DemuxPES plantait si jamais le header pes etait plus
gros que le premier packet ts du pes.

Benny

diff --git a/src/input/input.c b/src/input/input.c
index a30a66bb3d9f3a0c00850a4876cdb9747185c807..230058d5c8929bb2ee63fde9b5268b599327d4dd 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -632,8 +632,8 @@ static __inline__ void input_DemuxTS( input_thread_t *p_input,
         if( p[4] )
         {
             /* If the packet has both adaptation_field and payload, adaptation_field
-               cannot be more than 182 bytes long; if there is only an adaptation_field,
-               it must fill the next 183 bytes. */
+               cannot be more than 182 bytes long; if there is only an
+              adaptation_field, it must fill the next 183 bytes. */
             if( b_payload ? (p[4] > 182) : (p[4] != 183) )
             {
                 intf_DbgMsg("input debug: invalid TS adaptation field (%p)\n",
@@ -658,20 +658,20 @@ static __inline__ void input_DemuxTS( input_thread_t *p_input,
                        discontinuity. We let the PCR decoder handle that. */
                     p_es_descriptor->b_discontinuity = 1;
                     
-                    /* There also may be a continuity_counter discontinuity: resynchronise
-                       our counter with the one of the stream */
+                    /* There also may be a continuity_counter discontinuity:
+                      resynchronise our counter with the one of the stream */
                     p_es_descriptor->i_continuity_counter = (p[3] & 0x0f) - 1;
                 }
 
                 /* random_access_indicator */
                 p_es_descriptor->b_random |= p[5] & 0x40;
 
-                /* If this is a PCR_PID, and this TS packet contains a PCR, we pass it
-                   along to the PCR decoder. */
+                /* If this is a PCR_PID, and this TS packet contains a PCR,
+                  we pass it along to the PCR decoder. */
                 if( (p_es_descriptor->b_pcr) && (p[5] & 0x10) )
                 {
-                    /* There should be a PCR field in the packet, check if the adaption
-                       field is long enough to carry it */
+                    /* There should be a PCR field in the packet, check if the
+                      adaption field is long enough to carry it */
                     if( p[4] >= 7 )
                     {
                         /* Call the PCR decoder */
@@ -810,8 +810,13 @@ static __inline__ void input_DemuxPES( input_thread_t *p_input,
         {
             /* This part of the header does not fit in the current TS packet:
                copy the part of the header we are interested in to the
-               p_pes_header_save buffer */
-            intf_DbgMsg("Code never tested encourtered, WARNING ! (benny)\n");
+               p_pes_header_save buffer. The buffer is dynamicly allocated if
+              needed so it's time expensive but this situation almost never
+              occur. */
+            intf_DbgMsg("Code never tested encountered, WARNING ! (benny)\n");
+           if( !p_pes->p_pes_header_save )
+               p_pes->p_pes_header_save = malloc(PES_HEADER_SIZE); 
+
             do
             {
                 memcpy(p_pes->p_pes_header_save + i_dummy,

diff --git a/src/input/input_netlist.c b/src/input/input_netlist.c
index 044dbc73453917f77886b1f1bbf7c913d032c67e..caf3b3efc4f6a54d77a8afb710e9c3ebd82943bf 100644 (file)
--- a/src/input/input_netlist.c
+++ b/src/input/input_netlist.c
@@ -103,6 +103,15 @@ int input_NetlistOpen( input_thread_t *p_input )
                               = p_input->netlist.p_pes_packets + i_packets;
     }
 
+    /* the p_pes_header_save buffer is allocated on the fly by the PES
+       demux if needed, and freed with the PES packet when the netlist
+       is destroyed. We initialise the field to NULL so that the demux
+       can determine if it has already allocated this buffer or not. */
+    for( i_packets = 0; i_packets < INPUT_MAX_PES + 1; i_packets++ )
+    {
+      p_input->netlist.p_pes_packets[i_packets].p_pes_header_save = NULL;
+    }
+
     return( 0 );
 }
 
@@ -111,7 +120,21 @@ int input_NetlistOpen( input_thread_t *p_input )
  ******************************************************************************/
 void input_NetlistClean( input_thread_t *p_input )
 {
-    free( p_input->netlist.p_ts_packets );                 /* free TS netlist */
-    free( p_input->netlist.p_pes_packets );               /* free PES netlist */
+    int i;
+
+    /* free TS netlist */
+    free( p_input->netlist.p_ts_packets );
+
+    /* free the pes_buffer_save buffers of the PES packets if they have
+       been allocated */
+    for( i = 0; i < INPUT_MAX_PES + 1; i++ )
+    {
+      byte_t* p_buffer = p_input->netlist.p_pes_packets[i].p_pes_header_save;
+      if(p_buffer)
+       free(p_buffer);
+    }
+
+    /* free PES netlist */
+    free( p_input->netlist.p_pes_packets );
 }