From 6f23e91e335b3415080fcbc90cb9fc3cdcc4344f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 7 Nov 2014 18:42:51 +0100 Subject: [PATCH] lib/upnp/ContentDirectoryService: swap uri_apply_base() parameters When uri_apply_base() was moved from db/upnp/Util.cpp to util/UriUtil.cpp, the parameter order was changed, however without swapping the parameters in the ContentDirectoryService constructor. --- NEWS | 2 ++ src/lib/upnp/ContentDirectoryService.cxx | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0de0a829c..d59b2eff3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.19.3 (not yet released) +* database + - upnp: fix breakage due to malformed URIs * decoder - audiofile: fix crash while playing streams diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx index ee7c0d7f5..0e5d2d955 100644 --- a/src/lib/upnp/ContentDirectoryService.cxx +++ b/src/lib/upnp/ContentDirectoryService.cxx @@ -29,7 +29,7 @@ ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device, const UPnPService &service) - :m_actionURL(uri_apply_base(device.URLBase, service.controlURL)), + :m_actionURL(uri_apply_base(service.controlURL, device.URLBase)), m_serviceType(service.serviceType), m_deviceId(device.UDN), m_friendlyName(device.friendlyName),