ogg: Fix a heap buffer overflow.

[vlc] / modules / services_discovery / upnp.hpp

diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp
index 2b74463e5614be75519646955176bdb73ee8f03e..2bfa4f7f2500f1028a6f83e7c7e46a95547f4f71 100644 (file)
--- a/modules/services_discovery/upnp.hpp
+++ b/modules/services_discovery/upnp.hpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * Upnp.hpp :  UPnP discovery module (libupnp) header
+ * upnp.hpp :  UPnP discovery module (libupnp) header
  *****************************************************************************
- * Copyright (C) 2004-2008 the VideoLAN team
+ * Copyright (C) 2004-2010 the VideoLAN team
  * $Id$
  *
  * Authors: Rémi Denis-Courmont <rem # videolan.org> (original plugin)
@@ -40,12 +40,12 @@ class MediaServer
 {
 public:
 
-    static void parseDeviceDescription( IXML_Document* doc,
-                                        const char*    location,
+    static void parseDeviceDescription( IXML_Document* p_doc,
+                                        const char*    psz_location,
                                         services_discovery_t* p_sd );
 
-    MediaServer( const char* UDN,
-                 const char* friendlyName,
+    MediaServer( const char* psz_udn,
+                 const char* psz_friendly_name,
                  services_discovery_t* p_sd );
 
     ~MediaServer();
@@ -53,40 +53,42 @@ public:
     const char* getUDN() const;
     const char* getFriendlyName() const;
 
-    void setContentDirectoryEventURL( const char* url );
+    void setContentDirectoryEventURL( const char* psz_url );
     const char* getContentDirectoryEventURL() const;
 
-    void setContentDirectoryControlURL( const char* url );
+    void setContentDirectoryControlURL( const char* psz_url );
     const char* getContentDirectoryControlURL() const;
 
     void subscribeToContentDirectory();
     void fetchContents();
 
     void setInputItem( input_item_t* p_input_item );
+    input_item_t* getInputItem() const;
 
-    bool compareSID( const char* sid );
+    bool compareSID( const char* psz_sid );
 
 private:
 
-    bool _fetchContents( Container* parent );
-    void _buildPlaylist( Container* container, input_item_node_t * );
+    bool _fetchContents( Container* p_parent, int i_starting_index );
+    void _buildPlaylist( Container* p_container, input_item_node_t *p_item_node );
 
     IXML_Document* _browseAction( const char*, const char*,
             const char*, const char*, const char*, const char* );
 
     services_discovery_t* _p_sd;
 
-    Container* _contents;
-    input_item_t* _inputItem;
+    Container* _p_contents;
+    input_item_t* _p_input_item;
 
     std::string _UDN;
-    std::string _friendlyName;
+    std::string _friendly_name;
 
-    std::string _contentDirectoryEventURL;
-    std::string _contentDirectoryControlURL;
+    std::string _content_directory_event_url;
+    std::string _content_directory_control_url;
 
-    int _subscriptionTimeOut;
-    Upnp_SID _subscriptionID;
+    int _i_subscription_timeout;
+    int _i_content_directory_service_version;
+    Upnp_SID _subscription_id;
 };
 
 
@@ -97,11 +99,11 @@ public:
     MediaServerList( services_discovery_t* p_sd );
     ~MediaServerList();
 
-    bool addServer( MediaServer* s );
-    void removeServer( const char* UDN );
+    bool addServer( MediaServer* p_server );
+    void removeServer( const char* psz_udn );
 
-    MediaServer* getServer( const char* UDN );
-    MediaServer* getServerBySID( const char* );
+    MediaServer* getServer( const char* psz_udn );
+    MediaServer* getServerBySID( const char* psz_sid );
 
 private:
 
@@ -118,24 +120,26 @@ public:
     Item( Container*  parent,
           const char* objectID,
           const char* title,
-          const char* resource );
+          const char* resource,
+          mtime_t duration );
     ~Item();
 
     const char* getObjectID() const;
     const char* getTitle() const;
     const char* getResource() const;
+    mtime_t getDuration() const;
 
     void setInputItem( input_item_t* p_input_item );
-    input_item_t* getInputItem() const ;
 
 private:
 
-    input_item_t* _inputItem;
+    input_item_t* _p_input_item;
 
     Container* _parent;
     std::string _objectID;
     std::string _title;
     std::string _resource;
+    mtime_t _duration;
 };
 
 
@@ -164,7 +168,7 @@ public:
 
 private:
 
-    input_item_t* _inputItem;
+    input_item_t* _p_input_item;
 
     Container* _parent;