[vlc-commits] upnp: Fix wrong comparison of psz_satip_channellist

Marvin Scholz git at videolan.org
Wed Aug 1 13:19:07 CEST 2018


vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Tue Jul 31 14:31:48 2018 +0200| [a08b75793359306e558d6f97c8a009b83f5f1980] | committer: Hugo Beauzée-Luyssen

upnp: Fix wrong comparison of psz_satip_channellist

(cherry picked from commit 856bb8dc7085b77985f87ec5b8c45a1f8399071f)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a08b75793359306e558d6f97c8a009b83f5f1980
---

 modules/services_discovery/upnp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 2cac666256..8201e95d83 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -624,7 +624,7 @@ MediaServerList::parseSatipServer( IXML_Element* p_device_element, const char *p
     /* Part 2: device playlist
      * In Automatic mode, or if requested by the user, check for a SAT>IP m3u list on the device */
     if (strncmp(psz_satip_channellist, "ServerList", 10) == 0 ||
-        strncmp(psz_satip_channellist, "Auto", strlen ("Auto") == 0 )) {
+        strncmp(psz_satip_channellist, "Auto", strlen ("Auto")) == 0 ) {
         const char* psz_m3u_url = xml_getChildElementValue( p_device_element, "satip:X_SATIPM3U" );
         if ( psz_m3u_url ) {
             if ( strncmp( "http", psz_m3u_url, 4) )
@@ -669,7 +669,7 @@ MediaServerList::parseSatipServer( IXML_Element* p_device_element, const char *p
      * MasterList is a list of usual Satellites */
 
     /* In Auto mode, default to MasterList list from satip.info */
-    if( strncmp(psz_satip_channellist, "Auto", strlen ("Auto") == 0 ) ) {
+    if( strncmp(psz_satip_channellist, "Auto", strlen ("Auto")) == 0 ) {
         psz_satip_channellist = strdup( "MasterList" );
     }
 



More information about the vlc-commits mailing list