Attachment 91850 Details for Bug 129355 – patch-modules__demux__real.c

patch-modules__demux__real.c

patch-modules__demux__real.c (text/x-csrc), 1.81 KB, created by Joseph S Atkinson on 2008-12-03 08:33:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph S Atkinson

Created: 2008-12-03 08:33:47 UTC

Size: 1.81 KB

patch

obsolete

>--- modules/demux/real.c.orig	2008-12-03 02:44:32.000000000 -0500
>+++ modules/demux/real.c	2008-12-03 02:44:16.000000000 -0500
>@@ -925,23 +925,20 @@
> 
>     msg_Dbg( p_demux, "Real Index : num : %d ", i_index_count );
> 
>-    if( i_index_count == 0 )
>+    if( i_index_count >= ( 0xffffffff / sizeof( rm_index_t ) ) )
>         return;
> 
>     if( GetDWBE( &buffer[16] ) > 0 )
>         msg_Dbg( p_demux, "Real Index: Does next index exist? %d ",
>                         GetDWBE( &buffer[16] )  );
> 
>-    p_sys->p_index = 
>-            (rm_index_t *)malloc( sizeof( rm_index_t ) * (i_index_count+1) );
>+    p_sys->p_index = malloc( ( i_index_count + 1 ) * sizeof( rm_index_t ) );
>     if( p_sys->p_index == NULL )
>     {
>         msg_Err( p_demux, "Memory allocation error" ); 
>         return;
>     }
> 
>-    memset( p_sys->p_index, 0, sizeof(rm_index_t) * (i_index_count+1) );
>-
>     for( i=0; i<i_index_count; i++ )
>     {
>         if( stream_Read( p_demux->s, buffer, 14 ) < 14 )
>@@ -957,12 +954,13 @@
>         p_sys->p_index[i].time_offset = GetDWBE( &buffer[2] );
>         p_sys->p_index[i].file_offset = GetDWBE( &buffer[6] );
>         p_sys->p_index[i].frame_index = GetDWBE( &buffer[10] );
>-        msg_Dbg( p_demux, "Real Index: time %d file %d frame %d ",
>-                        p_sys->p_index[i].time_offset,
>-                        p_sys->p_index[i].file_offset,
>-                        p_sys->p_index[i].frame_index );
>-
>+        msg_Dbg( p_demux,
>+                 "Real Index: time %"PRIu32" file %"PRIu32" frame %"PRIu32,
>+                 p_sys->p_index[i].time_offset,
>+                 p_sys->p_index[i].file_offset,
>+                 p_sys->p_index[i].frame_index );
>     }
>+    memset( p_sys->p_index + i_index_count, 0, sizeof( rm_index_t ) );
> }
> 
> /*****************************************************************************

Actions: View

Attachments on bug 129355: 91849 | 91850 | 91851