Skip to content

Fix encode/decode errors in structs. #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cykerway wants to merge 2 commits into from
Closed

Fix encode/decode errors in structs. #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4028d
Fix encode/decode errors in structs.
cykerway Sep 3, 2017
a863c97
Use a larger recv buffer.
cykerway Sep 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Xlib/protocol/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
# We're the recieving thread, parse the data
if recieving:
try:
bytes_recv = self.socket.recv(2048)
bytes_recv = self.socket.recv(2 * 1024 * 1024)
except socket.error as err:
self.close_internal('server: %s' % err[1])
raise self.socket_error
Expand Down
13 changes: 7 additions & 6 deletions Xlib/protocol/rq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ def pack_value(self, val):
if isinstance(val, bytes):
val_bytes = val
else:
val_bytes = val.encode()
val_bytes = val.encode('latin-1')
slen = len(val_bytes)

if self.pad:
Expand All @@ -424,7 +424,7 @@ def pack_value(self, val):

def parse_binary_value(self, data, display, length, format):
if length is None:
return data.decode(), b''
return data.decode('latin-1'), b''

if self.pad:
slen = length + ((4 - length % 4) % 4)
Expand All @@ -434,7 +434,7 @@ def parse_binary_value(self, data, display, length, format):
if sys.version_info < (3, 0):
data_str = data[:length]
else:
data_str = data[:length].decode()
data_str = data[:length].decode('latin-1')

return data_str, data[slen:]

Expand Down Expand Up @@ -720,7 +720,8 @@ class ValueList(Field):

def __init__(self, name, mask, pad, *fields):
self.name = name
self.maskcode = '={0}{1}x'.format(unsigned_codes[mask], pad).encode()
self.maskcode = \
'={0}{1}x'.format(unsigned_codes[mask], pad).encode('latin-1')
self.maskcodelen = struct.calcsize(self.maskcode)
self.fields = []

Expand Down Expand Up @@ -899,11 +900,11 @@ class StrClass(object):
structcode = None

def pack_value(self, val):
return (chr(len(val)) + val).encode()
return (chr(len(val)) + val).encode('latin-1')

def parse_binary(self, data, display):
slen = byte2int(data) + 1
return data[1:slen].decode(), data[slen:]
return data[1:slen].decode('latin-1'), data[slen:]

Str = StrClass()

Expand Down