XSPF: fix realloc() integer overflow

[vlc] / modules / demux / playlist / playlist.h

diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index 542f2347de1ef2df1b8bc81e53b7f9bc488cfdfd..3c3c80719dd54534fa42e2ce15e26248fa3e08bb 100644 (file)
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -21,32 +21,90 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-char *E_(ProcessMRL)( char *, char * );
-char *E_(FindPrefix)( demux_t * );
+#include <vlc_input.h>
+#include <vlc_playlist.h>
 
-vlc_bool_t E_(FindItem)( demux_t *, playlist_t *, playlist_item_t **);
+char *ProcessMRL( const char *, const char * );
+char *FindPrefix( demux_t * );
 
-int E_(Import_Old) ( vlc_object_t * );
+int Import_Old ( vlc_object_t * );
 
-int E_(Import_Native) ( vlc_object_t * );
-void E_(Close_Native) ( vlc_object_t * );
+int Import_Native ( vlc_object_t * );
+void Close_Native ( vlc_object_t * );
 
-int E_(Import_M3U) ( vlc_object_t * );
-void E_(Close_M3U) ( vlc_object_t * );
+int Import_M3U ( vlc_object_t * );
+void Close_M3U ( vlc_object_t * );
 
-int E_(Import_PLS) ( vlc_object_t * );
-void E_(Close_PLS) ( vlc_object_t * );
+int Import_RAM ( vlc_object_t * );
+void Close_RAM ( vlc_object_t * );
 
-int E_(Import_B4S) ( vlc_object_t * );
-void E_(Close_B4S) ( vlc_object_t * );
+int Import_PLS ( vlc_object_t * );
+void Close_PLS ( vlc_object_t * );
 
-int E_(Import_DVB) ( vlc_object_t * );
-void E_(Close_DVB) ( vlc_object_t * );
+int Import_B4S ( vlc_object_t * );
+void Close_B4S ( vlc_object_t * );
 
-int E_(Import_podcast) ( vlc_object_t * );
-void E_(Close_podcast) ( vlc_object_t * );
+int Import_DVB ( vlc_object_t * );
+void Close_DVB ( vlc_object_t * );
 
-int E_(xspf_import_Activate) ( vlc_object_t * );
+int Import_podcast ( vlc_object_t * );
+void Close_podcast ( vlc_object_t * );
+
+int Import_xspf ( vlc_object_t * );
+void Close_xspf ( vlc_object_t * );
+
+int Import_Shoutcast ( vlc_object_t * );
+void Close_Shoutcast ( vlc_object_t * );
+
+int Import_ASX ( vlc_object_t * );
+void Close_ASX ( vlc_object_t * );
+
+int Import_SGIMB ( vlc_object_t * );
+void Close_SGIMB ( vlc_object_t * );
+
+int Import_QTL ( vlc_object_t * );
+void Close_QTL ( vlc_object_t * );
+
+int Import_GVP ( vlc_object_t * );
+void Close_GVP ( vlc_object_t * );
+
+int Import_IFO ( vlc_object_t * );
+void Close_IFO ( vlc_object_t * );
+
+int Import_VideoPortal ( vlc_object_t * );
+void Close_VideoPortal ( vlc_object_t * );
+
+int Import_iTML ( vlc_object_t * );
+void Close_iTML ( vlc_object_t * );
+
+int Import_WPL ( vlc_object_t * );
+void Close_WPL ( vlc_object_t * );
+
+int Import_ZPL ( vlc_object_t * );
+void Close_ZPL ( vlc_object_t * );
+
+extern input_item_t * GetCurrentItem(demux_t *p_demux);
+
+#define STANDARD_DEMUX_INIT_MSG( msg ) do { \
+    DEMUX_INIT_COMMON();                    \
+    msg_Dbg( p_demux, "%s", msg ); } while(0)
+
+#define DEMUX_BY_EXTENSION_MSG( ext, msg ) \
+    demux_t *p_demux = (demux_t *)p_this; \
+    if( !demux_IsPathExtension( p_demux, ext ) ) \
+        return VLC_EGENERIC; \
+    STANDARD_DEMUX_INIT_MSG( msg );
+
+#define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \
+    demux_t *p_demux = (demux_t *)p_this; \
+    if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
+        return VLC_EGENERIC; \
+    STANDARD_DEMUX_INIT_MSG( msg );
+
+
+#define CHECK_PEEK( zepeek, size ) do { \
+    if( stream_Peek( p_demux->s , &zepeek, size ) < size ){ \
+        msg_Dbg( p_demux, "not enough data" ); return VLC_EGENERIC; } } while(0)
+
+#define POKE( peek, stuff, size ) (strncasecmp( (const char *)peek, stuff, size )==0)
 
-int E_(Import_Shoutcast) ( vlc_object_t * );
-void E_(Close_Shoutcast) ( vlc_object_t * );