Changeset e1066b6e97b167911e96a618990cbe8ceb516977

Timestamp:

11/10/07 00:04:56 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1192053896 +0000

git-parent:

[5c1bbbefaf98811bf723297694f964951915c059]

git-author:

Laurent Aimar <fenrir@videolan.org> 1192053896 +0000

Message:

id3tag: fixed segfault (introduced with demux_meta_t)

Files:

• modules/meta_engine/id3tag.c (modified) (6 diffs)
• modules/meta_engine/taglib.cpp (modified) (1 diff)

modules/meta_engine/id3tag.c

@@ -66 +66 @@
-    int i;
-
-    TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
-    p_demux_meta->p_meta = NULL;
-
-    p_id3_tag = id3_tag_parse( p_data, i_size );
-    if( !p_id3_tag )
-        return;
-
-
+
+
+
-
-#define ID_IS( a ) (!strcmp(  p_frame->id, a ))
@@ -266 +265 @@
-static void ParseAPEvXTag( demux_t *p_demux, uint8_t *p_data, int i_data )
-{
-
+
+
-    vlc_bool_t b_start;
-    vlc_bool_t b_end;
@@ -280 +280 @@
-        return;
-
+    if( !p_demux_meta->p_meta )
+        p_demux_meta->p_meta = vlc_meta_New();
+    p_meta = p_demux_meta->p_meta;
+
-    if( b_start )
-    {
@@ -297 +301 @@
-    if( i_entry <= 0 )
-        return;
-
-    if( !p_meta )
-        p_demux->p_private = p_meta = vlc_meta_New();
-
-    while( i_entry > 0 && i_data >= 10 )
@@ -482 +483 @@
-static int ParseTags( vlc_object_t *p_this )
-{
-
-
-
+
+
+
+
-
-    msg_Dbg( p_demux, "checking for ID3v1/2 and APEv1/2 tags" );
-
-    stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &b_seekable );
-    if( !b_seekable )
-SUCCESS
+EGENERIC
-
-    i_init = stream_Tell( p_demux->s );
+
+    TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
+    p_demux_meta->p_meta = NULL;
-
-    /* */
@@ -505 +509 @@
-     */
-    stream_Seek( p_demux->s, i_init );
+    if( !p_demux_meta->p_meta && p_demux_meta->i_attachments <= 0 )
+        return VLC_EGENERIC;
-    return VLC_SUCCESS;
-}
+

modules/meta_engine/taglib.cpp

@@ -232 +232 @@
-    demux_t         *p_demux = (demux_t *)p_this;
-    demux_meta_t    *p_demux_meta = (demux_meta_t*)p_demux->p_private;
- = p_demux_meta->p_meta
+
-
-    TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );