<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">
code{white-space: pre-wrap;}
span.smallcaps{font-variant: small-caps;}
span.underline{text-decoration: underline;}
div.column{display: inline-block; vertical-align: top; width: 50%;}
</style>
</head>
<body>
<p>Ops, I didn’t <em>fixup</em> properly.</p>
<p>See attached file for updated patch.</p>
<p>On 2018-07-31 14:44, Filip Roséen wrote:</p>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> Prevents a potential null-dereference on the line that follows.
---
modules/services_discovery/upnp.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index b72ad208a1..14778cd2fa 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -572,6 +572,9 @@ MediaServerList::parseSatipServer( IXML_Element* p_device_element, const char *p
psz_satip_channellist = strdup("Auto");
}
+ if( unlikely( !psz_satip_channellist ) )
+ return;
+
/* Part 1: a user may have provided a custom playlist url */
if (strncmp(psz_satip_channellist, "CustomList", 10) == 0) {
char *psz_satip_playlist_url = config_GetPsz( "satip-channellist-url" );
--
2.18.0</code></pre>
</blockquote>
</body>
</html>