mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 15:55:53 +00:00
Code Issues Releases Wiki Activity

lib: correctly handle padding of dump images

Browse Source 
With the switch to Python3 and binary output it is not possible to use
code like: 'f.write('\0' * (rounded - size))'. Switching to binary
helps.

Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
Adrian Reber
2021-03-15 14:30:04 +00:00
committed by Andrei Vagin
parent abe3405b20
commit 248b773676
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/py/images/images.py
View File

@@ -390,7 +390,7 @@ class ipc_sem_set_handler:
if len(s) != entry['nsems']: if len(s) != entry['nsems']:
raise Exception("Number of semaphores mismatch") raise Exception("Number of semaphores mismatch")
f.write(s.tobytes()) f.write(s.tobytes())
f.write('\0' * (rounded - size)) f.write(b'\0' * (rounded - size))
def skip(self, f, pbuff): def skip(self, f, pbuff):
entry = pb2dict.pb2dict(pbuff) entry = pb2dict.pb2dict(pbuff)
@@ -428,7 +428,7 @@ class ipc_msg_queue_handler:
rounded = round_up(msg.msize, sizeof_u64) rounded = round_up(msg.msize, sizeof_u64)
data = base64.decodebytes(extra[i + 1]) data = base64.decodebytes(extra[i + 1])
f.write(data[:msg.msize]) f.write(data[:msg.msize])
f.write('\0' * (rounded - msg.msize)) f.write(b'\0' * (rounded - msg.msize))
def skip(self, f, pbuff): def skip(self, f, pbuff):
entry = pb2dict.pb2dict(pbuff) entry = pb2dict.pb2dict(pbuff)
@@ -462,7 +462,7 @@ class ipc_shm_handler:
data = base64.decodebytes(extra) data = base64.decodebytes(extra)
rounded = round_up(size, sizeof_u32) rounded = round_up(size, sizeof_u32)
f.write(data[:size]) f.write(data[:size])
f.write('\0' * (rounded - size)) f.write(b'\0' * (rounded - size))
def skip(self, f, pbuff): def skip(self, f, pbuff):
entry = pb2dict.pb2dict(pbuff) entry = pb2dict.pb2dict(pbuff)