oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/upnp: obtain char* from ixmlwrap::getFirstElementValue()

Browse Source 
Fixes crash when there's no SearchCaps element.
This commit is contained in:
Max Kellermann 2014-01-22 19:49:02 +01:00
parent 02f2171010
commit 0fa98479ad
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/db/upnp/ContentDirectoryService.cxx
View File

@ -27,6 +27,7 @@
#include "Action.hxx" #include "Action.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include <string.h>
#include <stdio.h> #include <stdio.h>
ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device, ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device,
@ -243,19 +244,22 @@ ContentDirectoryService::getSearchCapabilities(UpnpClient_Handle hdl,
return false; return false;
} }
std::string tbuf = ixmlwrap::getFirstElementValue(response, "SearchCaps"); const char *s = ixmlwrap::getFirstElementValue(response, "SearchCaps");
ixmlDocument_free(response); if (s == nullptr || *s == 0) {
ixmlDocument_free(response);
if (!tbuf.compare("*")) { return true;
result.insert(result.end(), "*");
} else if (!tbuf.empty()) {
if (!csvToStrings(tbuf.c_str(), result)) {
error.Set(upnp_domain, "Bad response");
return false;
}
} }
return true; bool success = true;
if (strcmp(s, "*") == 0) {
result.insert(result.end(), "*");
} else if (!csvToStrings(s, result)) {
error.Set(upnp_domain, "Bad response");
success = false;
}
ixmlDocument_free(response);
return success;
} }
bool bool