Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont rely on constants from the pickle module

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-15 15:48:32 +05:30
parent fae355fe65
commit e9b26ebb00
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/utils/__init__.py
View File

@ -28,7 +28,7 @@ def join_with_timeout(q, timeout=2):
def unpickle_binary_string(data): def unpickle_binary_string(data):
# Maintains compatibility with python's pickle module protocol version 2 # Maintains compatibility with python's pickle module protocol version 2
import struct import struct
from pickle import PROTO, SHORT_BINSTRING, BINSTRING PROTO, SHORT_BINSTRING, BINSTRING = b'\x80', b'U', b'T'
if data.startswith(PROTO + b'\x02'): if data.startswith(PROTO + b'\x02'):
offset = 2 offset = 2
which = data[offset] which = data[offset]
@ -47,6 +47,6 @@ def unpickle_binary_string(data):
def pickle_binary_string(data): def pickle_binary_string(data):
# Maintains compatibility with python's pickle module protocol version 2 # Maintains compatibility with python's pickle module protocol version 2
import struct import struct
from pickle import PROTO, BINSTRING, STOP PROTO, STOP, BINSTRING = b'\x80', b'.', b'T'
data = bytes(data) data = bytes(data)
return PROTO + b'\x02' + BINSTRING + struct.pack(b'<i', len(data)) + data + STOP return PROTO + b'\x02' + BINSTRING + struct.pack(b'<i', len(data)) + data + STOP