*** a/libs/libmythupnp/ssdp.cpp	2014-12-10 22:29:10.912018687 -0700
--- b/libs/libmythupnp/ssdp.cpp	2014-12-10 22:01:31.929533300 -0700
***************
*** 314,346 ****
  
  void SSDP::ProcessData( MSocketDevice *pSocket )
  {
-     QHostAddress  peerAddress = pSocket->peerAddress();
-     quint16       peerPort    = pSocket->peerPort   ();
- 
-     // Mitigate against SSDP Reflection DDOS attacks
-     // Disallow device discovery from non-local addresses
-     // Security Advisory (Akamai):
-     // https://www.prolexic.com/kcresources/prolexic-threat-advisories/prolexic-threat-advisory-ssdp-reflection-ddos-attacks/ssdp-reflection-attacks-cybersecurity-locked.html
-     // https://www.prolexic.com/knowledge-center-ddos-threat-advisory-ssdp-reflection-ddos-attacks.html
-     //
-     // TODO: We may want to restrict this to the same subnet as the server
-     //       for added security
-     if (((peerAddress.protocol() == QAbstractSocket::IPv4Protocol) &&
-             (!peerAddress.isInSubnet(QHostAddress("172.16.0.0"), 12) &&
-             !peerAddress.isInSubnet(QHostAddress("192.168.0.0"), 16) &&
-             !peerAddress.isInSubnet(QHostAddress("10.0.0.0"), 8))) ||
-         ((peerAddress.protocol() == QAbstractSocket::IPv6Protocol) &&
-             !peerAddress.isInSubnet(pSocket->address(), 64))) // default subnet size is assumed to be /64
-     {
-         LOG(VB_GENERAL, LOG_CRIT, QString("SSDP Request from WAN IP "
-                                             "address (%1). Possible SSDP "
-                                             "Reflection attempt. Ignoring as "
-                                             "security risk.")
-                                                 .arg(peerAddress.toString()));
-         pSocket->readAll(); // Discard the data in the socket buffer
-         return;
-     }
- 
      QByteArray buffer;
      long nBytes = 0;
      int retries = 0;
--- 314,319 ----
***************
*** 392,397 ****
--- 365,399 ----
          if (buffer.isEmpty())
              continue;
  
+         QHostAddress  peerAddress = pSocket->peerAddress();
+         quint16       peerPort    = pSocket->peerPort   ();
+ 
+         // Mitigate against SSDP Reflection DDOS attacks
+         // Disallow device discovery from non-local addresses
+         // Security Advisory (Akamai):
+         // https://www.prolexic.com/kcresources/prolexic-threat-advisories/prolexic-threat-advisory-ssdp-reflection-ddos-attacks/ssdp-reflection-attacks-cybersecurity-locked.html
+         // https://www.prolexic.com/knowledge-center-ddos-threat-advisory-ssdp-reflection-ddos-attacks.html
+         //
+         // TODO: We may want to restrict this to the same subnet as the server
+         //       for added security
+         if (!peerAddress.isNull() && (peerAddress != QHostAddress::Null) &&
+             ((peerAddress.protocol() == QAbstractSocket::IPv4Protocol) &&
+                 (!peerAddress.isInSubnet(QHostAddress("172.16.0.0"), 12) &&
+                  !peerAddress.isInSubnet(QHostAddress("192.168.0.0"), 16) &&
+                  !peerAddress.isInSubnet(QHostAddress("10.0.0.0"), 8))) ||
+             ((peerAddress.protocol() == QAbstractSocket::IPv6Protocol) &&
+                 !peerAddress.isInSubnet(pSocket->address(), 64))) // default subnet size is assumed to be /64
+           {
+             LOG(VB_GENERAL, LOG_CRIT, QString("SSDP Request from WAN IP "
+                                               "address (%1). Possible SSDP "
+                                               "Reflection attempt. Ignoring as "
+                                               "security risk.")
+                 .arg(peerAddress.toString()));
+             continue;
+             //pSocket->readAll(); // Discard the data in the socket buffer
+             //return;
+         }
+ 
          // ------------------------------------------------------------------
          QString     str          = QString(buffer.constData());
          QStringList lines        = str.split("\r\n", QString::SkipEmptyParts);