Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Tue, 12 Apr 2016 18:48:33 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 12 Apr 2016 18:48:33 +0200
- branch
- 6_1_x
- changeset 4936
- f68a61f6b5ca
- parent 4935
- 243867c2b810 (diff)
- parent 4931
- a349883c8188 (current diff)
- child 4938
- 78287a4f976b
Merged remote changes.
--- a/Helpviewer/FlashCookieManager/FlashCookieReader.py Sat Apr 09 18:32:42 2016 +0200 +++ b/Helpviewer/FlashCookieManager/FlashCookieReader.py Tue Apr 12 18:48:33 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(
