Import release 2.0.1

2009-11-30 23:30:30 +00:00
parent dd04b72a67
commit f0ec035c02
188 changed files with 52826 additions and 20824 deletions
@@ -931,7 +931,9 @@ NetworkWindow::~NetworkWindow()
        logMessage += formatRawData( incoming, message, slpLength, 1 );
      }
    }
-    else if( dataSize >= 18 && message[ p2pDataStart ] == '\x80' )
+    else if( dataSize >= 18
+         &&  message.size() > p2pDataStart
+         &&  message[ p2pDataStart ] == '\x80' )
    {
      // Webcam invitation
      QString camMessage( QString::fromUtf16( reinterpret_cast<const ushort *>( dataPtr + 10 ), ( safeSize - 10 - 1 ) / 2 ) );