Changeset 2e4d57cfa8bcdb2c3c404bfd55a396b00a1bf77b

Timestamp:

18/08/08 19:37:51 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219081071 +0200

git-parent:

[9aba8655bc20754bddd83c3733059c6846145826]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219069621 +0200

Message:

Fixed flac demuxer segfault (/0) when seektable is empty.

Files:

• modules/demux/flac.c (modified) (4 diffs)

modules/demux/flac.c

@@ -284 +284 @@
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
-    int64_t i_next_time;
-    int64_t i_next_offset;
-    int64_t i_delta_time;
-    int64_t i_delta_offset;
-    bool b_seekable;
-    int i;
@@ -303 +300 @@
-            break;
-    }
-    if( i+1 < p_sys->i_seekpoint )
-    {
-        i_next_time   = p_sys->seekpoint[i+1]->i_time_offset;
-        i_next_offset = p_sys->seekpoint[i+1]->i_byte_offset;
-    }
-    else
-    {
-        i_next_time   = p_sys->i_length;
-        i_next_offset = stream_Size(p_demux->s)-p_sys->i_data_pos;
-    }
-    i_delta_time = i_time - p_sys->seekpoint[i]->i_time_offset;
-    i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time /
-                            (p_sys->seekpoint[i+1]->i_time_offset-p_sys->seekpoint[i]->i_time_offset);
-
-    /* XXX We do exact seek if it's not too far away(45s) */
@@ -322 +307 @@
-        if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos ) )
-            return VLC_EGENERIC;
+
-        p_sys->i_time_offset = p_sys->seekpoint[i]->i_time_offset - p_sys->i_pts;
-        p_sys->i_pts_start = p_sys->i_pts+i_delta_time;
@@ -328 +314 @@
-    else
-    {
+        int64_t i_delta_offset;
+        int64_t i_next_time;
+        int64_t i_next_offset;
+
+        if( i+1 < p_sys->i_seekpoint )
+        {
+            i_next_time   = p_sys->seekpoint[i+1]->i_time_offset;
+            i_next_offset = p_sys->seekpoint[i+1]->i_byte_offset;
+        }
+        else
+        {
+            i_next_time   = p_sys->i_length;
+            i_next_offset = stream_Size(p_demux->s)-p_sys->i_data_pos;
+        }
+
+        i_delta_offset = 0;
+        if( i_next_time-p_sys->seekpoint[i]->i_time_offset > 0 )
+            i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time /
+                             (i_next_time-p_sys->seekpoint[i]->i_time_offset);
+
-        if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos + i_delta_offset ) )
-            return VLC_EGENERIC;
+
-        p_sys->i_pts_start = p_sys->i_pts;
-        p_sys->i_time_offset = (p_sys->seekpoint[i]->i_time_offset+i_delta_time) - p_sys->i_pts;