frodovdr/vdr-plugin-satip
1
0
Fork 0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 13:37:42 +02:00
Code Issues Releases Wiki Activity

Fixed a memory leak in TinyXML implementation (Thanks to Oliver Endriss).

Browse Source
This commit is contained in:
Rolf Ahrenberg 2015-03-18 20:55:10 +02:00
parent 39249ca2d5
commit 7019b719a5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -124,3 +124,5 @@ VDR Plugin 'satip' Revision History
2015-XX-XX: Version 2.2.1 2015-XX-XX: Version 2.2.1
- Robustify the server discovery. - Robustify the server discovery.
- Fixed a memory leak in TinyXML implementation
(Thanks to Oliver Endriss).

8
discover.c
View File

@ -56,11 +56,12 @@ size_t cSatipDiscover::WriteCallback(char *ptrP, size_t sizeP, size_t nmembP, vo
if (obj) { if (obj) {
CURLcode res = CURLE_OK; CURLcode res = CURLE_OK;
const char *desc = NULL, *model = NULL, *addr = NULL; const char *desc = NULL, *model = NULL, *addr = NULL;
SATIP_CURL_EASY_GETINFO(obj->handleM, CURLINFO_PRIMARY_IP, &addr);
#ifdef USE_TINYXML #ifdef USE_TINYXML
TiXmlDocument doc; TiXmlDocument doc;
char *xml = MALLOC(char, len + 1); char *xml = MALLOC(char, len + 1);
memcpy(xml, ptrP, len); memcpy(xml, ptrP, len);
*(xml + len + 1) = 0; *(xml + len) = 0;
doc.Parse((const char *)xml); doc.Parse((const char *)xml);
TiXmlHandle docHandle(&doc); TiXmlHandle docHandle(&doc);
TiXmlElement *descElement = docHandle.FirstChild("root").FirstChild("device").FirstChild("friendlyName").ToElement(); TiXmlElement *descElement = docHandle.FirstChild("root").FirstChild("device").FirstChild("friendlyName").ToElement();
@ -69,6 +70,8 @@ size_t cSatipDiscover::WriteCallback(char *ptrP, size_t sizeP, size_t nmembP, vo
TiXmlElement *modelElement = docHandle.FirstChild("root").FirstChild("device").FirstChild("satip:X_SATIPCAP").ToElement(); TiXmlElement *modelElement = docHandle.FirstChild("root").FirstChild("device").FirstChild("satip:X_SATIPCAP").ToElement();
if (modelElement) if (modelElement)
model = modelElement->GetText() ? modelElement->GetText() : "DVBS2-1"; model = modelElement->GetText() ? modelElement->GetText() : "DVBS2-1";
obj->AddServer(addr, model, desc);
FREE_POINTER(xml);
#else #else
pugi::xml_document doc; pugi::xml_document doc;
pugi::xml_parse_result result = doc.load_buffer(ptrP, len); pugi::xml_parse_result result = doc.load_buffer(ptrP, len);
@ -80,9 +83,8 @@ size_t cSatipDiscover::WriteCallback(char *ptrP, size_t sizeP, size_t nmembP, vo
if (modelNode) if (modelNode)
model = modelNode.text().as_string("DVBS2-1"); model = modelNode.text().as_string("DVBS2-1");
} }
#endif
SATIP_CURL_EASY_GETINFO(obj->handleM, CURLINFO_PRIMARY_IP, &addr);
obj->AddServer(addr, model, desc); obj->AddServer(addr, model, desc);
#endif
} }
return len; return len;