* Modules.am : added aac.c and wav.c

 * asf/asf.c: better check for invalid header.

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 3aa44a34358a0f9f77686bec6674d586ff03740d..e786671069efbbbb9f245d31f6bf93cd2a0f3e4e 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -5,4 +5,6 @@ SOURCES_m3u = m3u.c
 SOURCES_demuxdump = demuxdump.c
 SOURCES_rawdv = rawdv.c
 SOURCES_au = au.c
+SOURCES_wav = wav.c
+SOURCES_aac = aac.c
 SOURCES_mkv = mkv.cpp

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index bee006a7dc75f07de8760900f8691299a4796271..f9a554e7186a09af8e9649c84f826611df86d77f 100644 (file)
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -2,7 +2,7 @@
  * asf.c : ASFv01 file input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: asf.c,v 1.29 2003/05/22 21:42:43 gbazin Exp $
+ * $Id: asf.c,v 1.30 2003/08/01 00:16:37 fenrir Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -280,16 +280,12 @@ static int Activate( vlc_object_t * p_this )
                 p_wf->nBlockAlign       = GetWLE( p_data + 12 );
                 p_wf->wBitsPerSample    = GetWLE( p_data + 14 );
                 input_AddInfo( p_cat, _("Bits Per Sample"), "%d", p_wf->wBitsPerSample );
-                p_wf->cbSize            = __MAX( 0,
-                                              i_size - sizeof( WAVEFORMATEX ));
-                if( i_size > sizeof( WAVEFORMATEX ) )
+                p_wf->cbSize            = __MIN( GetWLE( p_data + 16 ), i_size - sizeof( WAVEFORMATEX ));
+                if( p_wf->cbSize > 0 )
                 {
-                    memcpy( (uint8_t*)p_wf + sizeof( WAVEFORMATEX ),
-                            p_data + sizeof( WAVEFORMATEX ),
-                            i_size - sizeof( WAVEFORMATEX ) );
+                    memcpy( &p_wf[1], p_data + sizeof( WAVEFORMATEX ), p_wf->cbSize );
                 }
             }
-
         }
         else
         if( CmpGUID( &p_sp->i_stream_type, &asf_object_stream_type_video ) )