Mercurial Repositories > eric / changeset

diff -r 98ef487d00eb -r 070b8f12b60d Helpviewer/FlashCookieManager/FlashCookieReader.py
--- a/Helpviewer/FlashCookieManager/FlashCookieReader.py	Thu Apr 14 18:54:39 2016 +0200
+++ b/Helpviewer/FlashCookieManager/FlashCookieReader.py	Thu Apr 14 18:55:31 2016 +0200
@@ -104,6 +104,8 @@
         self.__data.seek(0)
         self.__data.read(2)
         sLenData = self.__data.read(4)
+        if len(sLenData) != 4:
+            raise FlashCookieReaderError("Flash cookie is invalid.")
         lenData, = struct.unpack(">L", sLenData)    # unsigned long, big-endian
         if lenSolData != lenData + 6:
             raise FlashCookieReaderError(

diff -r 98ef487d00eb -r 070b8f12b60d WebBrowser/FlashCookieManager/FlashCookieReader.py
--- a/WebBrowser/FlashCookieManager/FlashCookieReader.py	Thu Apr 14 18:54:39 2016 +0200
+++ b/WebBrowser/FlashCookieManager/FlashCookieReader.py	Thu Apr 14 18:55:31 2016 +0200
@@ -104,6 +104,8 @@
         self.__data.seek(0)
         self.__data.read(2)
         sLenData = self.__data.read(4)
+        if len(sLenData) != 4:
+            raise FlashCookieReaderError("Flash cookie is invalid.")
         lenData, = struct.unpack(">L", sLenData)    # unsigned long, big-endian
         if lenSolData != lenData + 6:
             raise FlashCookieReaderError(

diff -r 98ef487d00eb -r 070b8f12b60d eric6_webbrowser.py
--- a/eric6_webbrowser.py	Thu Apr 14 18:54:39 2016 +0200
+++ b/eric6_webbrowser.py	Thu Apr 14 18:55:31 2016 +0200
@@ -30,6 +30,22 @@
 import sys
 import os
 
+try:
+    from PyQt5 import QtWebKit      # __IGNORE_WARNING__
+except ImportError:
+    from PyQt5.QtCore import qVersion, QTimer
+    from PyQt5.QtWidgets import QApplication
+    from E5Gui import E5MessageBox
+    app = QApplication([])
+    QTimer.singleShot(0, lambda: E5MessageBox.critical(
+        None,
+        "eric6 Web Browser (QtWebKit based)",
+        "QtWebKit is needed to run this variant of the eric6 Web Browser."
+        " However, it seems to be missing. You are using Qt {0}, which"
+        " doesn't include this anymore.".format(qVersion())))
+    app.exec_()
+    sys.exit(100)
+
 for arg in sys.argv[:]:
     if arg.startswith("--config="):
         import Globals